Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c

Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: NIngo Molnar <mingo@elte.hu>