Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 04:57:20 +0000 (20:57 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 04:57:20 +0000 (20:57 -0800)
commit96789ac4b3943fec27fb6bf2713633b01a3903ad
tree5fa9dce4561072e64e460c8d920851a63a3b0b98
parent77eebf346dfe87587ee8a54c76349a996e80c24f
parent958ddb75b04b792c701b2b08acdb200d638abf4e
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6