Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 21:27:40 +0000 (13:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 21:27:40 +0000 (13:27 -0800)
commit00ab2f3df33dd3e649904765767dd87ffbcb3acf
treeae0ed11f35b61e3199fb696fcd8aa06f3032ed76
parent4cf808eb443ead42777a0230b73aec0cee7fb298
parentf5e2a7b22e7d7dfda8794906d0fddeaaa09bb944
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6