Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000 (10:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000 (10:59 +0200)
Merge back Linus's latest branch so that we pick up the uprobes changes.

( I tested this branch locally and while it's one from the middle of the
  merge window it's a good one to base further work off. )

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge