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

Pull LED subsystem updates from Bryan Wu:
 - move LED trigger drivers into a new directory
 - lp55xx common driver updates
 - other led drivers updates and bug fixing

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS
  leds: leds-bd2802: add CONFIG_PM_SLEEP to suspend/resume functions
  leds: lp55xx: configure the clock detection
  leds: lp55xx: use common clock framework when external clock is used
  leds: leds-ns2: fix oops at module removal
  leds: leds-pwm: Defer led_pwm_set() if PWM can sleep
  leds: lp55xx: fix the sysfs read operation
  leds: lm355x, lm3642: support camera LED triggers for flash and torch
  leds: add camera LED triggers
  leds: trigger: use inline functions instead of macros
  leds: tca6507: Use of_match_ptr() macro
  leds: wm8350: Complain if we fail to reenable DCDC
  leds: renesas: set gpio_request_one() flags param correctly
  leds: leds-ns2: set devm_gpio_request_one() flags param correctly
  leds: leds-lt3593: set devm_gpio_request_one() flags param correctly
  leds: leds-bd2802: remove erroneous __exit annotation
  leds: atmel-pwm: remove erroneous __exit annotation
  leds: move LED trigger drivers into new subdirectory
  leds: add new LP5562 LED driver

diff --combined include/linux/mmc/host.h
index 8873e8349597aed9c76b27000c1777681eca0c5b,357e80efcde0ca1c7be8d4891a4dbb029a440c3d..e326ae2882a0c5155045a594186a5ded1768444f
--- 1/include/linux/mmc/host.h
--- 2/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@@ -280,7 -280,6 +280,7 @@@ struct mmc_host 
  #define MMC_CAP2_PACKED_WR    (1 << 13)       /* Allow packed write */
  #define MMC_CAP2_PACKED_CMD   (MMC_CAP2_PACKED_RD | \
                                 MMC_CAP2_PACKED_WR)
 +#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */
  
        mmc_pm_flag_t           pm_caps;        /* supported pm features */
  
@@@ -342,9 -341,7 +342,7 @@@
  
        mmc_pm_flag_t           pm_flags;       /* requested pm features */
  
- #ifdef CONFIG_LEDS_TRIGGERS
        struct led_trigger      *led;           /* activity led */
- #endif
  
  #ifdef CONFIG_REGULATOR
        bool                    regulator_enabled; /* regulator state */
@@@ -362,8 -359,6 +360,8 @@@
  
        unsigned int            actual_clock;   /* Actual HC clock rate */
  
 +      unsigned int            slotno; /* used for sdio acpi binding */
 +
        unsigned long           private[0] ____cacheline_aligned;
  };