tree 02e75a88f2f0472bca3515e08c8c12468b7d1797
parent 62fd98571727a22ef77f1a9c1637260ad5a10baa
parent 3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f
author Linus Torvalds <torvalds@linux-foundation.org> 1278299551 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278299551 -0700

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of/dma: fix build breakage in ppc4xx adma driver