From: Arnd Bergmann Date: Thu, 20 Jun 2013 13:40:16 +0000 (+0200) Subject: Merge tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~69^2~7 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f4b11b0fa91cf81738215483b2bb2c0b911285;p=pandora-kernel.git 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 --- 15f4b11b0fa91cf81738215483b2bb2c0b911285 Reading git-diff-tree failed