Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 23:43:39 +0000 (15:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 23:43:39 +0000 (15:43 -0800)
commit43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056
tree28e4c9fa3ac800e2799d48e981a25f1403c4502e
parent58cba4650a7a414eabd2b40cc9d8e45fcdf192d9
parent9f3f46b5fe83a56d380d4006dd2cd906bc186f91
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6