Merge remote branch 'tip/perf/core' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Fri, 15 Oct 2010 10:45:00 +0000 (12:45 +0200)
committerRobert Richter <robert.richter@amd.com>
Fri, 15 Oct 2010 10:45:00 +0000 (12:45 +0200)
commit6268464b370e234e0255330190f9bd5d19386ad7
tree5742641092ce64227dd2086d78baaede57da1f80
parent7df01d96b295e400167e78061b81d4c91630b12d
parent0fdf13606b67f830559abdaad15980c7f4f05ec4
Merge remote branch 'tip/perf/core' into oprofile/core

Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
arch/arm/kernel/perf_event.c
arch/sh/kernel/perf_event.c
drivers/oprofile/oprofile_perf.c
include/linux/perf_event.h
kernel/perf_event.c