From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jun 2017 23:51:35 +0000 (+0900)
Subject: Merge tag 'led_fixes_for_4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~723
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=374d801522fb4a809395c188b1a867c5ebcda752;p=platform%2Fkernel%2Flinux-rpi.git

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

374d801522fb4a809395c188b1a867c5ebcda752