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)
commitfcf48a725a176ba12aa7be64c50190deaa2f86df
tree5d611ba5b1eb4dd821c93ca2f9d08078b563305a
parent0e2af2a9abf94b408ff70679b692a8644fed4aab
parent3c502e7a0255d82621ff25d60cc816624830497e
Merge branch 'perf/urgent' of git://git./linux/kernel/git/frederic/random-tracing into perf/urgent
kernel/perf_event.c