tree b1aabd19b364e1eda286b943915651a98d9865fc
parent 7505ceaf863590b24a4c0c83b64817d26e0d51e3
parent 9067359faf890b3a18ab38c792d458fba77b32b4
author Linus Torvalds <torvalds@linux-foundation.org> 1409759095 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1409759095 -0700

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

Pull LED fix from Bryan Wu:
 "Hugh, Jiri and many other people found a kernel oops due to a LED
  change merged recently.  Now the right fix might just revert it and
  avoid the kernel oops"

* 'leds-fixes-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  Revert "leds: convert blink timer to workqueue"