diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /MAINTAINERS | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
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 | |||
| 623 | W: http://hackndev.com | 623 | W: http://hackndev.com |
| 624 | S: Maintained | 624 | S: Maintained |
| 625 | 625 | ||
| 626 | ARM/PALMZ72 SUPPORT | ||
| 627 | P: Sergey Lapin | ||
| 628 | M: slapin@ossfans.org | ||
| 629 | W: http://hackndev.com | ||
| 630 | S: Maintained | ||
| 631 | |||
| 626 | ARM/PLEB SUPPORT | 632 | ARM/PLEB SUPPORT |
| 627 | P: Peter Chubb | 633 | P: Peter Chubb |
| 628 | M: pleb@gelato.unsw.edu.au | 634 | M: pleb@gelato.unsw.edu.au |