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)

Trivial merge