From: Olof Johansson Date: Thu, 20 Sep 2012 23:47:56 +0000 (-0700) Subject: Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~57^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad;p=pandora-kernel.git Merge branch 'next/board-samsung' of git://git./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 --- e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad Reading git-diff-tree failed