From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 11 Mar 2011 06:48:52 +0000 (+0900)
Subject: Merge branch 'dev/pwm-backlight' into for-next
X-Git-Tag: v2.6.39-rc1~434^2^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d2f42cc275ba72a47ce6933b18480163ecf2740;p=pandora-kernel.git

Merge branch 'dev/pwm-backlight' into for-next

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
---

6d2f42cc275ba72a47ce6933b18480163ecf2740
Reading git-diff-tree failed