Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Jun 2012 15:00:37 +0000 (17:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Jun 2012 15:22:57 +0000 (17:22 +0200)
commitff1f74fdcf1881b6c008463c34e9e2a93abe117a
tree234f3bd33f6e6a74943be59211400a53da8d14bf
parent212d95dfdb66e5c81879b08e4f7fbfc8498b1ab5
parentdb0dc75d6403b6663c0eab4c6ccb672eb9b2ed72
Merge branch 'perf/urgent' into perf/core

Eliminate a conflict in a patch I am going to apply.

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