aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-02-07 16:43:28 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-07 16:43:28 -0500
commite4cc8fca1c77905bce91b42a1372d4a73069a529 (patch)
tree56897b891842ff3f52536c51dfc82a579e718713 /MAINTAINERS
parentae1a25da8448271a99745da03100d5299575a269 (diff)
parent432dc14fa40dea427d9ed476965001a816ff833b (diff)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts: arch/arm/configs/magician_defconfig
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0ea3a6d98714..799f9d818d18 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -622,7 +622,7 @@ P: Dirk Opfer
622M: dirk@opfer-online.de 622M: dirk@opfer-online.de
623S: Maintained 623S: Maintained
624 624
625ARM/PALMTX SUPPORT 625ARM/PALMTX,PALMT5,PALMLD SUPPORT
626P: Marek Vasut 626P: Marek Vasut
627M: marek.vasut@gmail.com 627M: marek.vasut@gmail.com
628W: http://hackndev.com 628W: http://hackndev.com