tree 431e59010f5b22cf26eb5db29136dfeaba2fe0fa
parent bafe00cc9297ca77b66e5c83e5e65e17c0c997c8
parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a
author Linus Torvalds <torvalds@g5.osdl.org> 1149804995 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149804995 -0700

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