Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
commitd779188d2baf436e67fe8816fca2ef53d246900f
tree9bac75842a5611172860feec3c4019ff874a2b89
parentf61ea1b0c825a20a1826bb43a226387091934586
parentac67c6247361b3b8644b34e5301a46d5069c1373
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6
drivers/net/sk98lin/skge.c
drivers/net/skge.c
drivers/net/wireless/ipw2200.c
net/core/dev.c