tree d047521fb2f8eafe92349ba4d6a66d6234886c87
parent cc513ac0f29473de365664c4fba9cf033c1f2324
parent ebcce7b13be837616a3f9d996f637cf3241e3948
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1223402915 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1223402915 +0100

Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im

Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile