Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
index c6f74865d7299ed7655455d2ff077d23c1c25368,1cedd61ddb2815c2f9166b310b6a8f885f5d5353..6ad52e219ec6dc2afab3cddb24156104865f887d
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -79,9 -80,9 +80,10 @@@ obj-$(CONFIG_LEDS_PCA995X)           += leds-pca
  obj-$(CONFIG_LEDS_PM8058)             += leds-pm8058.o
  obj-$(CONFIG_LEDS_POWERNV)            += leds-powernv.o
  obj-$(CONFIG_LEDS_PWM)                        += leds-pwm.o
 +obj-$(CONFIG_LEDS_QNAP_MCU)           += leds-qnap-mcu.o
  obj-$(CONFIG_LEDS_REGULATOR)          += leds-regulator.o
  obj-$(CONFIG_LEDS_SC27XX_BLTC)                += leds-sc27xx-bltc.o
+ obj-$(CONFIG_LEDS_ST1202)             += leds-st1202.o
  obj-$(CONFIG_LEDS_SUN50I_A100)                += leds-sun50i-a100.o
  obj-$(CONFIG_LEDS_SUNFIRE)            += leds-sunfire.o
  obj-$(CONFIG_LEDS_SYSCON)             += leds-syscon.o