tree af56a2cb903690076c1ceab2371d2aa9f2670dae
parent d19e9974084b4024abcfcfc9d8676c90d26994bb
parent 72f2afb8a6858edd9335cd158eb21053a0c2c39a
author Linus Torvalds <torvalds@g5.osdl.org> 1141756194 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141756194 -0800

Merge master.kernel.org:/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