From: Olof Johansson <olof@lixom.net>
Date: Sat, 29 Sep 2012 18:28:41 +0000 (-0700)
Subject: Merge branch 'samsung/boards' into next/dt2
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6590147b629949a2eba247b021e4ad0461c5e847;p=pandora-kernel.git

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>
---

6590147b629949a2eba247b021e4ad0461c5e847
Reading git-diff-tree failed