Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/coolone...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jul 2012 20:09:37 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jul 2012 20:09:37 +0000 (13:09 -0700)
commit24eee627eb7b05ac3cbca240f36b615969e65775
treed9c9bef83de3374d6dae335401ccf38aa14c99e4
parent5eecb9cc9029aef3c308fc94149c4a3065d40d9a
parentfb31fbeb647ed1910290712c13f11f1db09e5506
Merge branch 'fixes-for-3.5' of git://git./linux/kernel/git/cooloney/linux-leds

Pull leds fix from Bryan Wu:
 "Fix for heartbeat led trigger driver"

* 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: heartbeat: fix bug on panic