]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5a564aae87f86f1a20de2846fe2efc9ba438d0e5
tree9bac75842a5611172860feec3c4019ff874a2b89
parent68a3da32582f944a28ede929e1ab088ab84ad9f2
parentffb48c7697e86deeec7cbc8c40684a1ac71f413f
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/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