From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Sep 2014 15:44:55 +0000 (-0700)
Subject: Merge branch 'leds-fixes-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~11608
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51fe4d3baeaa976ca71e228f09950a960d4f7430;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'leds-fixes-for-3.17' of git://git./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"
---

51fe4d3baeaa976ca71e228f09950a960d4f7430