Merge tag 'led_fixes_for_4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jun 2017 23:51:35 +0000 (08:51 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jun 2017 23:51:35 +0000 (08:51 +0900)
commit374d801522fb4a809395c188b1a867c5ebcda752
treef68b42e9cafbea52a1106cc8f4f1cec10ed8d01e
parent19ea9d668a1f9f1e5e6752549150795a6693e6ad
parent436c4c45b5b9562b59cedbb51b7343ab4a6dd8cc
Merge tag 'led_fixes_for_4.12-rc6' of git://git./linux/kernel/git/j.anaszewski/linux-leds

Pull LED fixes from Jacek Anaszewski:
 "Two LED fixes:

   - fix signal source assignment for leds-bcm6328

   - revert patch that intended to fix LED behavior on suspend but it
     had a side effect preventing suspend at all due to uevent being
     sent on trigger removal"

* tag 'led_fixes_for_4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  Revert "leds: handle suspend/resume in heartbeat trigger"
  leds: bcm6328: fix signal source assignment for leds 4 to 7