tree e49b55bd229fe8d77831ef11e218ed7dda3e991b
parent 6ec4ed82e9cf2ee5c83fd529af69b2c63b004809
parent ace1297f7222ec5d6a33f41e792a21e999551924
author Arnd Bergmann <arnd@arndb.de> 1337024109 +0200
committer Arnd Bergmann <arnd@arndb.de> 1337024109 +0200

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>