Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500...
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Nov 2012 12:24:45 +0000 (13:24 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Nov 2012 12:24:45 +0000 (13:24 +0100)
commit64507dd7028e3e0145077e73b8374bd75aea117c
treea5d0f5a137a8ed948a1da22e9142bc5364908a75
parent61da823ab9f1e554da58f1c9f75931829582ad4f
parente13316d60658aee7987b51025f342649baa33487
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt

From Lee Jones <lee.jones@linaro.org>:

* 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500:
  ARM: ux500: Rename dbx500 cpufreq code to be more generic
  ARM: dts: add missing ux500 device trees
  ARM: ux500: Stop registering the PCM driver from platform code
  ARM: ux500: Move board specific GPIO info out to subordinate DTS files
  ARM: ux500: Disable the MMCI gpio-regulator by default

This follows up on the previous ux500 DT changes. Most importantly, it
resolves a build error in the dts files that was the result of referring
to a board specific device node from the common dtsi file.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/Makefile