Merge tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:40:16 +0000 (15:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:13:10 +0000 (16:13 +0200)
commit15f4b11b0fa91cf81738215483b2bb2c0b911285
treec2f30b1b5941f35b0884f02d485a0d04d984f3a0
parentdc61cd9ecb918f593972962b97cf6079ab9d1daf
parentc641d4dfef6d462c6d66a6fb57700086cd2f0106
Merge tag 'nomadik-dt-2' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:

Nomadik DT and clock work:
- Lee Jones' pinctrl compat ontology patches
- A real clock driver for the Nomadik, 100% DT-based
- Device tree changes for the Nomadik clocks

* tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms
  ARM: nomadik: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS

Conflicts:
arch/arm/boot/dts/ste-nomadik-s8815.dts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/ste-nomadik-s8815.dts
drivers/pinctrl/pinctrl-nomadik.c