Merge tag 'v3.15-rc1' into perf/urgent
authorIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 14:44:42 +0000 (16:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 14:44:42 +0000 (16:44 +0200)
Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/perf_event_intel_rapl.c