From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 19:35:09 +0000 (+0200)
Subject: Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
X-Git-Tag: v3.5-rc1~154^2~1
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/86e43a7aff23ce828273cbef6b0d2b0abe095ac8

Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt

* 'dt' of git://github.com/hzhuang1/linux:
  Documentation: update docs for mmp dt
  ARM: dts: refresh dts file for arch mmp
  ARM: mmp: support pxa910 with device tree
  ARM: mmp: support mmp2 with device tree
  gpio: pxa: parse gpio from DTS file
  ARM: mmp: support DT in timer
  ARM: mmp: support DT in irq
  ARM: mmp: append CONFIG_MACH_MMP2_DT
  ARM: mmp: fix build issue on mmp with device tree

Includes an update to v3-4-rc5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

86e43a7aff23ce828273cbef6b0d2b0abe095ac8