]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d86d6aa ce4e5cd)
Merge bk://gkernel.bkbits.net/net-drivers-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
drivers/net/8139too.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/airo.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/8139too.c
Simple merge
diff --cc drivers/net/wireless/airo.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.