]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bafe00c cb15f81)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Jun 2006 22:16:35 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Jun 2006 22:16:35 +0000 (15:16 -0700)
commit128e6ced247cda88f96fa9f2e4ba8b2c4a681560
tree431e59010f5b22cf26eb5db29136dfeaba2fe0fatree | snapshot
parentbafe00cc9297ca77b66e5c83e5e65e17c0c997c8commit | diff
parentcb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1acommit | diff
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
Linux 2.6 source tree