Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:10:25 +0000 (18:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:10:25 +0000 (18:10 +0100)
commitf165eb77f49cb6f6e86e2f2f09183904b2965d19
treedb166579758930f52a1a625eb872bd96bd7ff88e
parentfc1caf6eafb30ea185720e29f7f5eccca61ecd60
parenta6cd7eb374647b572ae9e7dbfe49871e6996e8e0
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
MAINTAINERS
arch/arm/boot/compressed/Makefile
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/eseries.c
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/spitz.c
drivers/pcmcia/Kconfig