Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
Russell King [Tue, 7 Oct 2008 18:08:35 +0000 (19:08 +0100)]
Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile


Trivial merge