From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 16 Aug 2012 09:00:30 +0000 (+0200)
Subject: Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=71f8e5b260e17a428dd7513c7d1e01777b69139b;p=linux-beck.git

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

From Haojian Zhuang <haojian.zhuang@gmail.com>:

Device Tree conversion patches for PXA and MMP, version 4

v4:
1. remove pinctrl patches for pxa.

v3:
1. Revert d03c1990c9681047bf94caa497c41172b3f28351 GPIO: gpio-pxa: fix
devicetree functions
since it's merged into Linus' gpio tree.

v2:
1. Add Linus's Ack in pinctrl driver.
2. Add chao's & haojian's patches for Tauros2 cache.

* 'dt' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable tauros2 cache in mmp2 dt
  ARM: mmp: enable tauros2 cache in pxa910
  ARM: cache: add dt support for tauros2 cache
  ARM: mmp&dove: modify tauros2_init call
  ARM: cache: add extra feature enable for tauros2
  ARM: cache: add cputype.h for tauros2
  ARM: cache: fix uninitialized ptr in tauros2_init
  gpio: pxa: add chain_eneter and chain_exit for irq handler
  ARM: pxa: support CKENC in clk_enable
  ARM: pxa: add .dtsi files
  ARM: pxa3xx: add generic DT machine code
  ARM: pxa3xx: skip default device initialization when booting via DT
  ARM: pxa: add devicetree code for irq handling
  GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip()
  MTD: pxa3xx-nand: add devicetree bindings
  RTC: add DT bindings to pxa-rtc

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

71f8e5b260e17a428dd7513c7d1e01777b69139b