diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-07 21:43:28 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-07 21:43:28 +0000 |
| commit | e4cc8fca1c77905bce91b42a1372d4a73069a529 (patch) | |
| tree | 56897b891842ff3f52536c51dfc82a579e718713 /MAINTAINERS | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
| parent | 432dc14fa40dea427d9ed476965001a816ff833b (diff) | |
| download | blackbird-op-linux-e4cc8fca1c77905bce91b42a1372d4a73069a529.tar.gz blackbird-op-linux-e4cc8fca1c77905bce91b42a1372d4a73069a529.zip | |
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-- | MAINTAINERS | 2 |
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 M: dirk@opfer-online.de S: Maintained -ARM/PALMTX SUPPORT +ARM/PALMTX,PALMT5,PALMLD SUPPORT P: Marek Vasut M: marek.vasut@gmail.com W: http://hackndev.com |
