Merge branches 'depends/rmk/devel-stable' and 'depends/irq/core' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

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