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
SchmErik · Feb 7, 2009 · e4cc8fc · e4cc8fc
2 parents ae1a25d + 432dc14
commit e4cc8fc
Show file tree

Hide file tree

Showing 13 changed files with 4,478 additions and 403 deletions.
diff --git 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