diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-27 13:24:45 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-27 13:24:45 +0100 |
| commit | 64507dd7028e3e0145077e73b8374bd75aea117c (patch) | |
| tree | a5d0f5a137a8ed948a1da22e9142bc5364908a75 /arch/arm/common | |
| parent | 61da823ab9f1e554da58f1c9f75931829582ad4f (diff) | |
| parent | e13316d60658aee7987b51025f342649baa33487 (diff) | |
| download | talos-obmc-linux-64507dd7028e3e0145077e73b8374bd75aea117c.tar.gz talos-obmc-linux-64507dd7028e3e0145077e73b8374bd75aea117c.zip | |
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>
Diffstat (limited to 'arch/arm/common')
0 files changed, 0 insertions, 0 deletions
