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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c
kernel/hrtimer.c

Simple merge
Simple merge