diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-24 01:07:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-24 01:07:32 +0200 |
| commit | ea541686d8454efac4f2b5c0767affb12d4b6a52 (patch) | |
| tree | ef0812fcc3e07c067042add6388146b3485c793e /include/asm-x86/proto.h | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | leds/acpi: Fix merge fallout from acpi_driver_data change (diff) | |
| download | linux-ea541686d8454efac4f2b5c0767affb12d4b6a52.tar.xz linux-ea541686d8454efac4f2b5c0767affb12d4b6a52.zip | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds/acpi: Fix merge fallout from acpi_driver_data change
leds: Simplify logic in leds-ams-delta
leds: Fix trigger registration race
leds: Fix leds-class.c comment
leds: Add driver for HP harddisk protection LEDs
leds: leds-pca955x - Mark pca955x_led_set() static
leds: Remove uneeded leds-cm-x270 driver
leds: Remove uneeded strlen calls
leds: Add leds-wrap default-trigger
leds: Make default trigger fields const
leds: Add backlight LED trigger
leds: da903x: Add support for LEDs found on DA9030/DA9034
Diffstat (limited to 'include/asm-x86/proto.h')
0 files changed, 0 insertions, 0 deletions