Merge bk://kernel.bkbits.net/davem/net-2.6
commitc8fab1b610a781a27932e8217cda711ce79e02da
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Sep 2004 09:35:16 +0000 (23 02:35 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Sep 2004 09:35:16 +0000 (23 02:35 -0700)
tree136284d8992311468d840201d47683d2172a5f14
parent5efa19a809ba89a6797ec48a3ae9675761f6e3d2
parent559b540de3d2d92c26e0753e473b4fcbd03116fd
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux