Commits

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
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