Merge branch 'oprofile/urgent' (early part) into oprofile/perf
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
commitad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5
tree2565121e4b9945d953e02c77a2e53065b3789aa4
parent86c8c04792f152c5469023885510140dd34817bc
parentc7a27aa4652c63172489a73f3961455650a79a7f
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
arch/arm/kernel/perf_event.c
kernel/perf_event.c