From: Linus Torvalds Date: Fri, 18 Nov 2005 20:23:07 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e67b23c71cb9ee02d65a74c3858716ba2dedd554;p=mv-sheeva.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- e67b23c71cb9ee02d65a74c3858716ba2dedd554