diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 18:49:43 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 20:16:17 (GMT) |
commit | ecf1b318347f6c250293ee8a9f2597373b00e0c3 (patch) | |
tree | effef2578bff73c0436fc965fb03dc583c0fa18b /arch/arm/mach-omap1/id.c | |
parent | 304ea74770c892cf115e128b0e0dc6636148b010 (diff) | |
parent | 2a5fdc9adde8476751b63a795e3d66ae2ee3979d (diff) | |
download | linux-fsl-qoriq-ecf1b318347f6c250293ee8a9f2597373b00e0c3.tar.xz |
Merge branch 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into for-next
Stephen Warren <swarren@wwwdotorg.org> writes:
This branch is based on the merge of the following branches from the
Tegra repo, which are all already pulled into arm-soc:
for-3.5/tegra30-audio
for-3.5/usb-ulpi
for-3.5/dt
... which are all based on for-3.5/gpio-pinmux
* 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: dt: tegra: invert status=disable vs status=okay
ARM: dt: tegra: consistent basic property ordering
ARM: dt: tegra: sort nodes based on bus order
ARM: dt: tegra: remove duplicate device_type property
ARM: dt: tegra: consistenly use lower-case for hex constants
ARM: dt: tegra: format regs properties consistently
ARM: dt: tegra: gpio comment cleanup
ARM: dt: tegra: remove unnecessary unit addresses
ARM: dt: tegra: whitespace cleanup
ARM: dt: tegra cardhu: fix typo in SDHCI node name
ARM: dt: tegra: cardhu: register core regulator tps62361
ARM: dt: tegra30.dtsi: Add SMMU node
ARM: dt: tegra20.dtsi: Add GART node
ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
ARM: dt: tegra: Add device tree support for AHB
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/id.c')
0 files changed, 0 insertions, 0 deletions