tree 48c18f788c81d84c895318c82cb35e8d19d23efa
parent 5b9c8972527fdb52d5cd7dadc9853c57430e0ff5
parent a4c84e6aafda0ddd8cb004c464cd11e47e211049
author Linus Torvalds <torvalds@linux-foundation.org> 1413904718 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1413904718 -0700

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED update from Bryan Wu:
 "Basically we have some bug fixing and clean up and one big thing is we
  start to merge patch to add support LED Flash class"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: gpio: cleanup the leds-gpio driver
  led: gpio: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
  led: gpio: Sort include headers alphabetically
  leds: Improve and export led_update_brightness
  leds: trigger: gpio: fix warning in gpio trigger for gpios whose accessor function may sleep
  leds: lp3944: fix sparse warning
  leds: avoid using DEVICE_ATTR macro for max_brightness attribute
  leds: make brightness type consistent across whole subsystem
  leds: Reorder include directives