Merge branch 'oprofile/perf' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: NRobert Richter <robert.richter@amd.com>
Showing
arch/sh/oprofile/op_impl.h
已删除
100644 → 0
drivers/oprofile/oprofile_perf.c
0 → 100644
想要评论请 注册 或 登录