Merge branch 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/coolone...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Nov 2012 01:03:28 +0000 (17:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Nov 2012 01:03:28 +0000 (17:03 -0800)
commit9dce781768f7320384926600fbd26387f3d38762
tree8ff79d1d962dfdaec16e91f309de85544472d040
parentb0db954c0491ce846bc49c0746ca6e1f868a1881
parent0b8728d6f140dc20690384286ade47c956edc999
Merge branch 'fixes-for-3.7' of git://git./linux/kernel/git/cooloney/linux-leds

Pull LED fix from Bryan Wu.

* 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  ledtrig-cpu: kill useless mutex to fix sleep in atomic context