diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 20:07:22 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 20:07:22 +0200 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /MAINTAINERS | |
| parent | Merge branch 'pxa-trizeps' into pxa-machines (diff) | |
| parent | [ARM] 5248/1: wm97xx generic battery driver (diff) | |
| download | linux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.xz linux-1543966a079fc7065849ae43ca4dd767c188ad55.zip | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d02ee7b6cd91..96b0137a575c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -623,6 +623,12 @@ M: marek.vasut@gmail.com W: http://hackndev.com S: Maintained +ARM/PALMZ72 SUPPORT +P: Sergey Lapin +M: slapin@ossfans.org +W: http://hackndev.com +S: Maintained + ARM/PLEB SUPPORT P: Peter Chubb M: pleb@gelato.unsw.edu.au |