]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 946e91f 0edd5b4)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:22:43 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:22:43 +0000 (17:22 -0700)
1  2 
drivers/net/s2io.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/s2io.c
Simple merge
Linux 2.6 source tree