Merge remote-tracking branch 'leds/for-next'

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/leds/leds-wm8350.c
index 4c62113f7a77d04a0eb7fb50de7fb84e089514bf,f5d9ac3ff16178480c6b39222170bcca4a82498a..88f23f845595e614c9164b3c1520375d77314521
--- 1/drivers/leds/leds-wm8350.c
--- 2/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@@ -275,10 -262,8 +262,8 @@@ static int wm8350_led_remove(struct pla
        struct wm8350_led *led = platform_get_drvdata(pdev);
  
        led_classdev_unregister(&led->cdev);
 -      flush_work_sync(&led->work);
 +      flush_work(&led->work);
        wm8350_led_disable(led);
-       regulator_put(led->dcdc);
-       regulator_put(led->isink);
        return 0;
  }
  

diff --cc include/linux/leds.h
Simple merge