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

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

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index a80a3163dd3034bbd55136432aca0d2372f77421,6639cced5f79810ee2ef5bb01d3e3b9c1ec5c103..686a4f270b123d6d1d2372298cfde9e8f69b248f
--- 1/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- 2/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <linux/delay.h>
  #include <linux/smsc911x.h>
  #include <linux/regulator/fixed.h>
 +#include <linux/regulator/machine.h>
+ #include <linux/pwm_backlight.h>
  
  #ifdef CONFIG_SMDK6410_WM1190_EV1
  #include <linux/mfd/wm8350/core.h>