Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme...
authorIngo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)

Trivial merge