summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2013-02-05 12:30:13 +0000
committerGrant Likely <grant.likely@secretlab.ca>2013-02-05 12:30:13 +0000
commitf305a0a8d7fcd1a600bd0b727cd8137ed223f721 (patch)
tree982681a7e3c643096b65b9626ae993597155979d /MAINTAINERS
parent766ed70447e0a9cfb23d068a4a929e18e54b0022 (diff)
parentd560040f7d6fbe0a2990b8f6edca1815e19e72f5 (diff)
downloadlinux-f305a0a8d7fcd1a600bd0b727cd8137ed223f721.tar.gz
Merge branch 'broonie/spi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
Minor features and bug fixes for PXA, OMAP and GPIO deivce drivers and a
cosmetic change to the bitbang driver.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 212c255b9347..1a747dde9bcb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7178,6 +7178,7 @@ F:	drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:	Grant Likely <grant.likely@secretlab.ca>
+M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
 L:	spi-devel-general@lists.sourceforge.net
 Q:	http://patchwork.kernel.org/project/spi-devel-general/list/
 T:	git git://git.secretlab.ca/git/linux-2.6.git