]> git.neil.brown.name Git - history.git/commit
Merge bk://gkernel.bkbits.net/net-drivers-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 16 Apr 2004 09:16:31 +0000 (02:16 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 16 Apr 2004 09:16:31 +0000 (02:16 -0700)
commit32686b9d8bc6001d7365caa517adef393548021d
tree25a15541e1d05b5109808301fe175c3a70aabb58
parent532de20cdce829c1af0f53eb01389005f2bc5966
parentfc252a2b4ef0ba7783511f7cb1d532f75d08f03e
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
drivers/net/Kconfig