Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git...

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>

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce,1ba87e9..12a1db2
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -355,11 -355,10 +356,15 @@@ static struct platform_pwm_backlight_da
        .pwm_period_ns  = 1000,
  };
  
 +/* I2C module and id for HDMIPHY */
 +static struct i2c_board_info hdmiphy_info = {
 +      I2C_BOARD_INFO("hdmiphy-exynos4210", 0x38),
 +};
 +
+ static struct pwm_lookup smdkv310_pwm_lookup[] = {
+       PWM_LOOKUP("s3c24xx-pwm.1", 0, "pwm-backlight.0", NULL),
+ };
+ 
  static void s5p_tv_setup(void)
  {
        /* direct HPD to HDMI chip */