tree 78cb630cb31a8cbec17463f9acc0f766707c232f
parent 4c6c826b22da9f6408b6bc6939a92aa0be838488
parent 46e446db4fb2cdb2f1bc69d3981fa23738a42835
author Olof Johansson <olof@lixom.net> 1331227627 -0800
committer Olof Johansson <olof@lixom.net> 1331227627 -0800

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

* 'dt' of git://github.com/hzhuang1/linux: (6 commits)
  Document: devicetree: add OF documents for arch-mmp
  ARM: dts: append DTS file of pxa168
  ARM: mmp: append OF support on pxa168
  ARM: mmp: enable rtc clk in pxa168
  i2c: pxa: add OF support
  serial: pxa: add OF support

  (plus update to v3.3-rc6)