Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:26:39 +0000 (09:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:26:39 +0000 (09:26 -0800)
commit388f7ef720a982f49925e7b4e96f216f208f8c03
tree75bfe3290db6d99232f56eadaf41a51197c5ba7c
parentd5eebf428ac91ad12d316a391b734670d61480d8
parent560c22fe1fc8b3523ef422da4f1cf04aa22d1471
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6