]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit7af9a17034ffc13117834d60b4a6f2c757e3c0b4
tree4f16f5b24f8c09405b3544340a3b2d2c92206e71
parentbb967271c0317de8eed56b20aae978d31507b033
parent5ab92a7cb82c66bf30685583a38a18538e3807db
Merge tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

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