Merge branch 'depends/rmk/devel-stable' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:23:28 +0000 (14:23 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:23:28 +0000 (14:23 +0100)
commit929f58aeeb46f964d9468ce1addd993f5d92b11d
tree95355731bd4d21d221cdc2a5ab073244ff76db65
parentfcd467137ea2da46ffe5cbfdb42e8a2b35f13dad
parenta26bce1220a4c5a7a074a779e6aad3cae63a94f7
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/common/gic.c
arch/arm/kernel/Makefile
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mm/dma-mapping.c