diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 11:28:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 11:28:41 -0700 |
| commit | 6590147b629949a2eba247b021e4ad0461c5e847 (patch) | |
| tree | 69679e660f8882ca8432e42a142d13d086ad14e1 /tools/perf/scripts/python | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| parent | fae9659a2cabcdaa01ea5a87568677e5cb037478 (diff) | |
Merge branch 'samsung/boards' into next/dt2
* samsung/boards:
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
Add/add conflict in arch/arm/mach-exynos/mach-smdkv310.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions