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

Pull LED updates from Bryan Wu:
 "This cycle we got:
   - new driver for leds-mc13783
   - bug fixes
   - code cleanup"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: make sure we unregister a trigger only once
  leds: leds-pwm: properly clean up after probe failure
  leds: clevo-mail: Make probe function __init
  leds-ot200: Fix dependencies
  leds-gpio: of: introduce MODULE_DEVICE_TABLE for module autoloading
  leds: clevo-mail: remove __initdata marker
  leds: leds-ss4200: remove __initdata marker
  leds: blinkm: remove unnecessary spaces
  leds: lp5562: remove unnecessary parentheses
  leds: leds-ss4200: remove DEFINE_PCI_DEVICE_TABLE macro
  leds: leds-s3c24xx: Trivial cleanup in header file
  drivers/leds: delete non-required instances of include <linux/init.h>
  leds: leds-gpio: add retain-state-suspended property
  leds: leds-mc13783: Add devicetree support
  leds: leds-mc13783: Remove unnecessary cleaning of registers on exit
  leds: leds-mc13783: Use proper "max_brightness" value fo LEDs
  leds: leds-mc13783: Use LED core PM functions
  leds: leds-mc13783: Add MC34708 LED support
  leds: Turn off led if blinking is disabled
  ledtrig-cpu: Handle CPU hot(un)plugging

diff --combined drivers/leds/Kconfig
index 44c358e,2394659..6de9dfb
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -416,12 -416,12 +416,12 @@@ config LEDS_MC1378
        depends on MFD_MC13XXX
        help
          This option enable support for on-chip LED drivers found
-         on Freescale Semiconductor MC13783/MC13892 PMIC.
+         on Freescale Semiconductor MC13783/MC13892/MC34708 PMIC.
  
  config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"
        depends on LEDS_CLASS
 -      depends on ARCH_KIRKWOOD
 +      depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
        default y
        help
          This option enable support for the dual-GPIO LED found on the
@@@ -431,7 -431,7 +431,7 @@@
  config LEDS_NETXBIG
        tristate "LED support for Big Network series LEDs"
        depends on LEDS_CLASS
 -      depends on ARCH_KIRKWOOD
 +      depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
        default y
        help
          This option enable support for LEDs found on the LaCie 2Big
@@@ -474,7 -474,7 +474,7 @@@ config LEDS_LM355
  
  config LEDS_OT200
        tristate "LED support for the Bachmann OT200"
-       depends on LEDS_CLASS && HAS_IOMEM
+       depends on LEDS_CLASS && HAS_IOMEM && (X86_32 || COMPILE_TEST)
        help
          This option enables support for the LEDs on the Bachmann OT200.
          Say Y to enable LEDs on the Bachmann OT200.