Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Russell King [Mon, 5 Dec 2011 23:27:54 +0000 (23:27 +0000)]
1  2 
arch/arm/kernel/setup.c
arch/arm/mach-bcmring/dma.c
arch/arm/mach-omap2/io.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mm/nommu.c
arch/arm/plat-omap/include/plat/io.h
include/linux/vmalloc.h
mm/vmalloc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/vmalloc.c
Simple merge