From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 23:07:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
X-Git-Tag: v2.6.28-rc1~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=ea541686d8454efac4f2b5c0767affb12d4b6a52

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
---

ea541686d8454efac4f2b5c0767affb12d4b6a52