Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:49:37 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:49:37 +0000 (15:49 -0800)
commitf327220b1494aa23fd4206ac4778b8aa449a3351
treeb463d2541db1638c7cb8b9ff10a9238fc8a47000
parent31b3c31bca3b4df975631323d6ee6f49f43f4956
parentea182d4aefa3a27847d890b1592a608d1180aa45
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6