]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jun 2016 17:06:57 +0000 (07:06 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jun 2016 17:06:57 +0000 (07:06 -1000)
Pull LED fixes from Jacek Anaszewski:

 - Fix brightness setting upon hardware blinking enabled

 - Handle suspend/resume in heartbeat trigger

* tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: handle suspend/resume in heartbeat trigger
  leds: core: Fix brightness setting upon hardware blinking enabled


Trivial merge