diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-21 18:52:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-21 18:52:07 +0100 |
| commit | 876454ac1a710acd434c2f23617f91d7df82387b (patch) | |
| tree | d3337be509247911864e08f44a0d9a2822fc782c /MAINTAINERS | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs (diff) | |
| download | linux-876454ac1a710acd434c2f23617f91d7df82387b.tar.xz linux-876454ac1a710acd434c2f23617f91d7df82387b.zip | |
Merge tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
- MAINTAINERS updates for brcmnand driver
- Fix reboot hangs seen when multiple NAND flash chips are registered
with the same controller
- Fix build issues on jz4740 NAND driver; the error was introduced in
4.3, so I guess nobody really cared, but we might as well fix it
* tag 'for-linus-20151120' of git://git.infradead.org/linux-mtd:
MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs
MAINTAINERS: brcmnand: Add Broadcom internal mailing-list
mtd: nand: fix shutdown/reboot for multi-chip systems
mtd: jz4740_nand: fix build on jz4740 after removing gpio.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b16bffabe70a..557a3ed9e244 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2449,7 +2449,9 @@ F: drivers/firmware/broadcom/* BROADCOM STB NAND FLASH DRIVER M: Brian Norris <computersforpeace@gmail.com> +M: Kamal Dasu <kdasu.kdev@gmail.com> L: linux-mtd@lists.infradead.org +L: bcm-kernel-feedback-list@broadcom.com S: Maintained F: drivers/mtd/nand/brcmnand/ |