aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-25 11:19:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-25 11:19:38 -0700
commit32fd3d4ac93261616564fbb544738b260f89bc7e (patch)
tree9325c092eba3def020fe6c6a80c70600428e0822 /MAINTAINERS
parent33b40178cb3bd75294d1a758b3f509a0d38682ab (diff)
parent5f867db63473f32cce1b868e281ebd42a41f8fad (diff)
downloadlinux-stericsson-32fd3d4ac93261616564fbb544738b260f89bc7e.tar.gz
Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris: "Two trivial updates. I meant to send these much earlier, but I've been preoccupied. - Add MAINTAINERS entry for diskonchip g3 driver - Fix an overlooked conflict in bitfield value assignments The latter update is a bit overdue, but there's no reason to wait any longer" * tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd: mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict MAINTAINERS: mtd: docg3: add docg3 maintainer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2eb627252239..9289ecb57b68 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6838,6 +6838,12 @@ T: git git://linuxtv.org/anttip/media_tree.git
S: Maintained
F: drivers/media/usb/msi2500/
+MSYSTEMS DISKONCHIP G3 MTD DRIVER
+M: Robert Jarzmik <robert.jarzmik@free.fr>
+L: linux-mtd@lists.infradead.org
+S: Maintained
+F: drivers/mtd/devices/docg3*
+
MT9M032 APTINA SENSOR DRIVER
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
L: linux-media@vger.kernel.org