From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Mar 2012 17:27:07 +0000 (-0800)
Subject: Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
X-Git-Tag: Ubuntu-5.10.0-12.13~21875^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a58f67e70a6cad021ceebd1c8919b898dd5d5de3;p=mirror_ubuntu-hirsute-kernel.git

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

a58f67e70a6cad021ceebd1c8919b898dd5d5de3