Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplu...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:30:36 +0000 (21:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:30:36 +0000 (21:30 +0100)
commit946342d03ec4e8367bba7bb99e7155e97f69058a
treebf61b17951f3696c3cde69624fcccdc05370e8aa
parent70100a02268423b7bceafdf0ed6b0245f9baf7e8
parentf8f02ec25ce3eafb049feeb3abf34fcd6e338241
parent1783d4574619aea9ff5d94e6506f288547fc6737
parent848a7b13aef0d8d611b6461b6cc250319fc1dbe1
parent6aaa189f8712471a250bfdf8fc8d08277258b8ab
parent5e45a0a1975df83fc068349e6a31fdf6af61a458
Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-linus
16 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/tlbflush.h
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/entry-header.S
arch/arm/kernel/setup.c
arch/arm/kvm/arm.c
arch/arm/kvm/coproc.c
arch/arm/kvm/vgic.c
arch/arm/mm/Kconfig
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
mm/mmap.c