From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 21:24:16 +0000 (-0800)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0~2005
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c745552a82cbf3a82adea5210212ed31ec03388d;p=platform%2Fkernel%2Flinux-amlogic.git

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.
---

c745552a82cbf3a82adea5210212ed31ec03388d