Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Mar 2006 18:29:54 +0000 (10:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Mar 2006 18:29:54 +0000 (10:29 -0800)
commitd0b004840bd3b5ff2f2a0ad14fa0bd43349f5175
treeaf56a2cb903690076c1ceab2371d2aa9f2670dae
parentd19e9974084b4024abcfcfc9d8676c90d26994bb
parent72f2afb8a6858edd9335cd158eb21053a0c2c39a
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TG3]: Add DMA address workaround