]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6ce9601c1204ed5f82993cf9e26734ccac8d96ca
treeb91919095c74742fa06e2105db6d859bee39b2b4
parent7e56d971d3fdddc1ee384e7b9822f8ad5f9c79b7
parentd101cd97947d87f2468fecf6ddadb8a876a94200
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