Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

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

diff --cc arch/arm/mach-bcmring/dma.c
Simple merge

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mm/nommu.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/io.h
Simple merge

diff --cc include/linux/vmalloc.h
Simple merge

diff --cc mm/vmalloc.c
Simple merge