OSDN Git Service

Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:08 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:08 +0000 (21:18 +0100)
commit9de44aa4dc969e4a46c2bfbd33d65bfa6ad2a15d
tree4447278a96dc075c1001ae10b7d8e94b7ae0adce
parent6fb18ac9366b74fadb2c1d0da88f143bfe87d001
parent079ed3681d748523e50c3947ca59507a7a181260
parentec3bd0e68a679a7af2c46af1ddc9af8b534a8b0e
parentc76f238e261b8d088f086c2e8551fa8402d86f42
parent0bbe6b5a73c00f8c8e7eb38fb86993f03cd64b70
Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next
arch/arm/Kconfig
arch/arm/include/asm/smp.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/mm/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7-2level.S