Merge branch 'dev/pwm-backlight' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 06:48:52 +0000 (15:48 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 06:48:52 +0000 (15:48 +0900)
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c


Trivial merge