From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Jul 2010 03:12:31 +0000 (-0700)
Subject: Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0~4289
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=744c557892d3bfb575287ee95947f5c0b9a0458f;p=platform%2Fkernel%2Flinux-amlogic.git

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

744c557892d3bfb575287ee95947f5c0b9a0458f