Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)
commit141b97433d77e39ac3ac111a7b3852192035259c
tree1ee4f8ab1d49f25471c3fd07a70fd4ab102261ef
parentd8dfad3876e4386666b759da3c833d62fb8b2267
parent8d258beb76e3bc7dcb65be93cde5c892ebe0346b
parent5cc91e0460889c8461620904968e193dddb1beb3
parent9fc2105aeaaf56b0cf75296a84702d0f9e64437b
Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
arch/arm/Kconfig
arch/arm/include/asm/spinlock.h
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/kvm/mmu.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S