Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit55faed1e607a24ca7f3453a3eb463ca8987f8139
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:22:43 +0000 (7 17:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:22:43 +0000 (7 17:22 -0700)
tree70c1f910576713e799b5b409d9f4c3c56840526e
parent946e91f36e90eea46758dd725b1c3b239f270f68
parent0edd5b44913cd0aba6f23b626b407f70bb3fb018
Merge branch 'upstream' of /linux/kernel/git/jgarzik/netdev-2.6
drivers/net/s2io.c