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

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
This commit is contained in:
Kukjin Kim 2011-03-11 15:48:52 +09:00
commit 6d2f42cc27
14 changed files with 290 additions and 49 deletions