Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 18:29:35 +0000 (10:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 18:29:35 +0000 (10:29 -0800)
commit0827f2b698735aee7cfb2990d393a82f6e1690eb
tree5eb1fa871154ab36c38794c4dc488698f13c71e0
parent70b4d63e98fd93fb9742708a54f872cba24e0fea
parentc6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6