Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:33 +0000 (13:24 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:33 +0000 (13:24 +0000)
commit2e0e943436912ffe0848ece58167edfe754edb96
treeb91919095c74742fa06e2105db6d859bee39b2b4
parenta32737e1ca650504f172292dd344eb64c02311f3
parentef3a0bf5bfadbace156fa2a3b9c753df2de41df2
Merge branch 'devel-stable' into for-linus

Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
13 files changed:
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-kota2.c
arch/arm/mm/fault.c
arch/arm/mm/proc-v7.S
mm/vmalloc.c