diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-20 16:47:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 16:47:56 -0700 |
| commit | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (patch) | |
| tree | 95b90b8ea821948f8996154ba5ed139ced0157ab /arch/arm/mach-mmp | |
| parent | 0e7d35c1fb708355ccef7cc4243509a3156c839b (diff) | |
| parent | fae9659a2cabcdaa01ea5a87568677e5cb037478 (diff) | |
Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards
From Kukjin Kim:
This is for updating non-DT Samsung board files for v3.7, there are adding
generic PWM lookup support and some updates.
* 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Use generic pwm driver in Origen board
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
Fixed trivial merge conflict in arch/arm/mach-exynos/mach-smdkv310.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mmp')
0 files changed, 0 insertions, 0 deletions