Merge branches 'misc', 'vdso' and 'fixes' into for-next

Conflicts:
	arch/arm/mm/proc-macros.S

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/include/asm/elf.h
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/proc-arm940.S
Simple merge

diff --cc arch/arm/mm/proc-arm946.S
Simple merge

diff --cc arch/arm/mm/proc-macros.S
Simple merge