aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-13 10:59:48 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-13 10:59:48 -0500
commit091994cfb8e7d7a372c2d547778a91012d899e16 (patch)
tree71c6d214f9287bb61d24345a93b60579937a711b /MAINTAINERS
parentd8ed516f82f0f4cda11282450512310ab273637e (diff)
parentc170093d31bd4e3bc51881cc0f123beeca7872c9 (diff)
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6: devicetree-discuss is moderated for non-subscribers MAINTAINERS: Add entry for GPIO subsystem dt: add documentation of ARM dt boot interface dt: Remove obsolete description of powerpc boot interface dt: Move device tree documentation out of powerpc directory spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0eff34bf0644..4837907a4eda 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4600,7 +4600,7 @@ F: drivers/i2c/busses/i2c-ocores.c
4600 4600
4601OPEN FIRMWARE AND FLATTENED DEVICE TREE 4601OPEN FIRMWARE AND FLATTENED DEVICE TREE
4602M: Grant Likely <grant.likely@secretlab.ca> 4602M: Grant Likely <grant.likely@secretlab.ca>
4603L: devicetree-discuss@lists.ozlabs.org 4603L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
4604W: http://fdt.secretlab.ca 4604W: http://fdt.secretlab.ca
4605T: git git://git.secretlab.ca/git/linux-2.6.git 4605T: git git://git.secretlab.ca/git/linux-2.6.git
4606S: Maintained 4606S: Maintained