Merge branch 'kprobes' of git://git.linaro.org/people/nico/linux into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 Apr 2011 10:02:45 +0000 (11:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 Apr 2011 10:02:45 +0000 (11:02 +0100)

Trivial merge