From: Linus Torvalds Date: Tue, 30 Oct 2007 19:04:29 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: v2.6.24-rc2~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71d00feca2598c68186ca5b83247746d6a7fed7e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: ixgb: fix TX hangs under heavy load e1000e: Fix typo ! & ixgbe: minor sparse fixes e1000: sparse warnings fixes ixgb: fix sparse warnings e1000e: fix sparse warnings mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2 Blackfin EMAC driver: Fix Ethernet communication bug (dupliated and lost packets) DM9601: Support for ADMtek ADM8515 NIC --- 71d00feca2598c68186ca5b83247746d6a7fed7e