Merge branch 'fixes-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/coolone...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2012 06:59:04 +0000 (09:59 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2012 06:59:04 +0000 (09:59 +0300)
commit3bf671af14d591ede9251acb0085e8017f3705e7
tree5e0e3e49c6524c422c3bbb66e661108a89bcb1ac
parent1c212c65b2468e9a302f06849e244d461cc89d86
parent4a5a4184628c529774c1492bc1a21743b69b5fc3
Merge branch 'fixes-for-3.6' of git://git./linux/kernel/git/cooloney/linux-leds

Pull leds fixes/revert from Bryan Wu.

* 'fixes-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: renesas: fix error handling
  Revert "leds: use led_set_brightness in led_trigger_event"
  leds: lp8788: Fix updating scale configuration bits