From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Tue, 19 Apr 2016 19:44:11 +0000 (+0200)
Subject: Merge branch 'mtd-nand-trigger' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.7-rc1~65^2~2^2~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8de53481b433e45638e8e5252cbfeb78d64ca4d9;p=thirdparty%2Flinux.git

Merge branch 'mtd-nand-trigger' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds into nand/next

Pull leds-trigger changes from Jacek Anaszewski.
Create a generic mtd led-trigger to replace the exisitng nand led-trigger
implementation.

* 'mtd-nand-trigger' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  mtd: Hook I/O activity to the MTD LED trigger
  mtd: nand: Remove the "nand-disk" LED trigger
  leds: trigger: Introduce a MTD (NAND/NOR) trigger
  mtd: Uninline mtd_write_oob and move it to mtdcore.c
  leds: trigger: Introduce a kernel panic LED trigger
---

8de53481b433e45638e8e5252cbfeb78d64ca4d9