From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jun 2016 17:06:57 +0000 (-1000)
Subject: Merge tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7af9a17034ffc13117834d60b4a6f2c757e3c0b4;p=linux-beck.git

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
---

7af9a17034ffc13117834d60b4a6f2c757e3c0b4