tree 760ddb82836a4e3edf314227c731d5dc181d11a7
parent 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473
parent 4e9687d9c843dc34d368358a36f5f1610e4fbab3
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1223402842 +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