Merge branch 'pxa-palm' into pxa-machines

Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
git-mirror · Oct 7, 2008 · 1543966 · 1543966
2 parents 5ff7f78 + 4e9687d
commit 1543966
Show file tree

Hide file tree

Showing 20 changed files with 2,403 additions and 452 deletions.
diff --git 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