Merge branch 'pxa-palm' into pxa-machines
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
commit1543966a079fc7065849ae43ca4dd767c188ad55
tree760ddb82836a4e3edf314227c731d5dc181d11a7
parent5ff7f78a3db462ea4edf1a781a2002d4e8a8a473
parent4e9687d9c843dc34d368358a36f5f1610e4fbab3
Merge branch 'pxa-palm' into pxa-machines

Conflicts:

drivers/mfd/Kconfig
drivers/pcmcia/Makefile
MAINTAINERS
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/input/touchscreen/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/pcmcia/Makefile