tree e9ca2570ad93965fd590e1c9717415709a836ad9
parent d41ad6df44fbd01837211cee3273ce2f9445be6e
parent 5d1034f01b3616d6636ab7851ad9e63d42abbbd6
author Linus Torvalds <torvalds@linux-foundation.org> 1295645056 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295645056 -0800

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

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/83xx: fix build failures on dt compatible list.