From: Linus Torvalds Date: Thu, 8 Jun 2006 22:16:35 +0000 (-0700) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=128e6ced247cda88f96fa9f2e4ba8b2c4a681560;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: e1000: remove risky prefetch on next_skb->data e1000: fix ethtool test irq alloc as "probe" [PATCH] bcm43xx: add DMA rx poll workaround to DMA4 --- 128e6ced247cda88f96fa9f2e4ba8b2c4a681560