]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge