Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Sep 2011 07:48:33 +0000 (08:48 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Sep 2011 07:48:33 +0000 (08:48 +0100)
commitf70cac8d9c7125f83048f8b3d1c60f5a041a165c
tree0d0efd72c1a41f973a919b16aac1d8210ed1ee30
parent4722cd7741c6404f967f7a7b8b666540b6c1663e
parent08aab447c56a5388cf0c768da476ad022f00fef8
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mm/init.c
kernel/events/core.c