Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm/mach-highbank/Kconfig
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge