diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:49:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:49:42 -0700 |
| commit | d910fc786014ac3fb72f837c329c112e0c7a9aea (patch) | |
| tree | 32f6c6eb4fdcf60fc0384f94502862cb24b8ab38 /drivers/leds/leds-cobalt-raq.c | |
| parent | 1d1764c39815db55e10b2d78732db4d6dd9d6039 (diff) | |
| parent | a7998cecf5073e0755feeb7fd50b2bdc08dea6bd (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* '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
Diffstat (limited to 'drivers/leds/leds-cobalt-raq.c')
0 files changed, 0 insertions, 0 deletions