Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 20:23:07 +0000 (12:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 20:23:07 +0000 (12:23 -0800)
commite67b23c71cb9ee02d65a74c3858716ba2dedd554
tree17cfeadd37b93ca758aa3ffb61e02edf62289aea
parentd4bf205305a9188894ac4e2e9875e42f9f8eabfd
parentf7492f17f2123f0f4db5f9e8ba89867a7b352658
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6