Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Russell King [Mon, 15 Mar 2010 14:27:06 +0000 (14:27 +0000)]
1  2 
arch/arm/kernel/perf_event.c

Simple merge