diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 03:55:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 03:55:15 +0200 |
| commit | e7b5ec998aacd69e22472e12a62f86d803e0033b (patch) | |
| tree | 8bfcde38dc846aeb329e8640f31420c2a63cd63b /sound/soc/pxa/zylonite.c | |
| parent | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'next/dt2' into HEAD (diff) | |
| download | linux-e7b5ec998aacd69e22472e12a62f86d803e0033b.tar.xz linux-e7b5ec998aacd69e22472e12a62f86d803e0033b.zip | |
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc device tree updates, take 2 from Olof Johansson:
"This branch contains mostly a set of changes for device tree bindings
on Samsung Exynos. It was staged behind the other branches due to
dependencies on pincontrol and board changes."
Fix up trivial conflict in drivers/clocksource/Makefile due to earlier
conflict resolution.
* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
ARM: EXYNOS: Add AUXDATA support for MSHC controllers
ARM: EXYNOS: Add support for MSHC controller clocks
ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
ARM: dts: use uart2 for console on smdkv310 and smdk5250
ARM: dts: Add basic dts file for Samsung Trats board
ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
ARM: dts: Assume status of all optional nodes as disabled for exynos4
ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
Diffstat (limited to 'sound/soc/pxa/zylonite.c')
0 files changed, 0 insertions, 0 deletions