]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge