Merge branch 'oprofile/urgent' (early part) into oprofile/perf

author Robert Richter <robert.richter@amd.com>

Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)

committer Robert Richter <robert.richter@amd.com>

Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
author Robert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
committer Robert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc kernel/perf_event.c
Simple merge
author	Robert Richter <robert.richter@amd.com>
	Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
committer	Robert Richter <robert.richter@amd.com>
	Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
		1	2
arch/arm/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history