Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
commit4aa96ccf9ee35cdbd0d423e87a4d551019570218
treedca6322681df2e8f33f65c07defce24db68f645c
parentcb5fd904f0f14866ab76ec1f6ca3469896e4e2cf
parent8f2ffa00fb3c05ec0659cd7b056c4e8e106072f1
Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c