Merge branch 'eseries' into pxa

Conflicts:

	arch/arm/mach-pxa/Makefile