Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:44:43 +0000 (11:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:44:43 +0000 (11:44 +0100)
commit3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727
treed0f196c53d209f44190fd8a6481823b7770866e6
parentcbd379b10019617457bda31eb243890f4377fa3e
parent809e660f438fc5a69bf57630a85bcd8112263f37
Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
17 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/cputype.h
arch/arm/include/asm/glue-proc.h
arch/arm/include/asm/smp_plat.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/mach-exynos/Kconfig
arch/arm/mm/context.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/flush.c
arch/arm/mm/mmu.c
arch/arm/mm/nommu.c
arch/arm/mm/proc-v7.S