Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:01 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:01 +0000 (16:44 -0700)
commit2ead1aa6f14ed542af0c9e2302a51ea02128f587
treedfaf465122239a8bb450913b2e95f4647d24892f
parent7f28f394bd68e58bf3938c67bbeca7825b4687b8
parentc8868611389aa28e0e5e0d63f468727781eac68c
Merge branch 'upstream-fixes' from /linux/kernel/git/jgarzik/netdev-2.6