842 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1223402842 +0100

Merge branch 'pxa-palm' into pxa-machines

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
…QvÑ”"x