]> err.no Git - linux-2.6/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:39:05 +0000 (09:39 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:39:05 +0000 (09:39 -0800)
commitcf10b2853f86e714eac7117484c0d368ce710fa4
tree6f1574a9de786c8c345ac852eff12d65b2d75bfe
parent14591de147f7c9656fa2b9c05680d2b46e286c40
parent166c3436d683cfe5316c7723ed746a93db053f12
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6