Merge branch 'perf/urgent' into perf/core, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
commit37b16beaa92860c378273ccdcc2ccb22c6cee047
tree4fc7f879c32d11d318f411dbe128d080ed8478f9
parent3e46d21285577a8c9e4c37f9b1002e567c440b28
parenta4b4f11b2783ec678cccb4ce7e4ce9665aa04a24
Merge branch 'perf/urgent' into perf/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c
kernel/hrtimer.c