Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:24:16 +0000 (13:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:24:16 +0000 (13:24 -0800)
commitc745552a82cbf3a82adea5210212ed31ec03388d
treee9ca2570ad93965fd590e1c9717415709a836ad9
parentd41ad6df44fbd01837211cee3273ce2f9445be6e
parent5d1034f01b3616d6636ab7851ad9e63d42abbbd6
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.