The following commit has been merged in the linux branch: commit 220a6258b1bac1f0b050a99aa8233330d6c8c416 Merge: f061d83a2b29f08b41c494335b7d23a432cb5a2d a003236c32706f3c1f74d4e3b98c58cf0d9a9d8f Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed Oct 14 15:25:23 2009 -0700
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf events: Update MAINTAINERS entry file patterns perf tools: Remove static debugfs path from parse-events perf tools: Fix the NO_64BIT build on pure 64-bit systems perf tools: Fix const char type propagation
diff --combined MAINTAINERS index ff96884,cf69091..6b05777 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -577,11 -577,6 +577,11 @@@ M: Mike Rapoport <mike@compulab.co.il L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained
+ARM/CONTEC MICRO9 MACHINE SUPPORT +M: Hubert Feurstein hubert.feurstein@contec.at +S: Maintained +F: arch/arm/mach-ep93xx/micro9.c + ARM/CORGI MACHINE SUPPORT M: Richard Purdie rpurdie@rpsys.net S: Maintained @@@ -4076,6 -4071,13 +4076,13 @@@ M: Peter Zijlstra <a.p.zijlstra@chello. M: Paul Mackerras paulus@samba.org M: Ingo Molnar mingo@elte.hu S: Supported + F: kernel/perf_event.c + F: include/linux/perf_event.h + F: arch/*/*/kernel/perf_event.c + F: arch/*/include/asm/perf_event.h + F: arch/*/lib/perf_event.c + F: arch/*/kernel/perf_callchain.c + F: tools/perf/
PERSONALITY HANDLING M: Christoph Hellwig hch@infradead.org