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
This commit is contained in:
Russell King 2008-10-07 19:08:35 +01:00 committed by Russell King
commit af7c951d76
13 changed files with 673 additions and 653 deletions