diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-06 04:57:38 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-06 04:57:38 -0400 |
| commit | 89de3820c7ae615345c093ae6fddac01f326fdc4 (patch) | |
| tree | 3e433ef080c3e1b691914a33d2d9e674f0744b47 /MAINTAINERS | |
| parent | 3ef48fac6e8e2362a4e6ef31dd043c89fe107875 (diff) | |
| parent | 80748fb8ff3bc068dccacb690cd2eb417b034ec7 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9673cd28a69b..4e7da96333f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -636,7 +636,7 @@ P: Dirk Opfer | |||
| 636 | M: dirk@opfer-online.de | 636 | M: dirk@opfer-online.de |
| 637 | S: Maintained | 637 | S: Maintained |
| 638 | 638 | ||
| 639 | ARM/PALMTX,PALMT5,PALMLD SUPPORT | 639 | ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT |
| 640 | P: Marek Vasut | 640 | P: Marek Vasut |
| 641 | M: marek.vasut@gmail.com | 641 | M: marek.vasut@gmail.com |
| 642 | W: http://hackndev.com | 642 | W: http://hackndev.com |