From: Linus Torvalds <torvalds@g5.osdl.org>
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-Tag: v2.6.17~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=128e6ced247cda88f96fa9f2e4ba8b2c4a681560;p=linux-2.6

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/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