Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Russell King [Wed, 21 Sep 2011 07:48:33 +0000 (08:48 +0100)]
1  2 
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mm/init.c
kernel/events/core.c

Simple merge
Simple merge