Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 09:37:51 +0000 (10:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 09:37:51 +0000 (10:37 +0100)
1  2 
kernel/perf_event.c

Simple merge