• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight · d910fc78
    Linus Torvalds authored
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
      backlight: new driver for ADP5520/ADP5501 MFD PMICs
      backlight: extend event support to also support poll()
      backlight/eeepc-laptop: Update the backlight state when we change brightness
      backlight/acpi: Update the backlight state when we change brightness
      backlight: Allow drivers to update the core, and generate events on changes
      backlight: switch to da903x driver to dev_pm_ops
      backlight: Add support for the Avionic Design Xanthos backlight device.
      backlight: spi driver for LMS283GF05 LCD
      backlight: move hp680-bl's probe function to .devinit.text
      backlight: Add support for new Apple machines.
      backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
      backlight: Add WM831x backlight driver
    
    Trivial conflicts due to '#ifdef CONFIG_PM' differences in
    drivers/video/backlight/da903x_bl.c
    d910fc78
video.c 61.1 KB