]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8a5b9b4dd521494a179417ce497168a49d0a24e1
tree5742641092ce64227dd2086d78baaede57da1f80
parentab1c58775384ec5064b0f2425b77ac151ac05e6e
parent92d3850d2b1eec812118017c75c4b43c0501643f
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