Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:21:24 +0000 (11:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:21:24 +0000 (11:21 +0100)
commitd949750fed168b6553ca11ed19e4affd19d7a4d7
treea98953ef3448b7b4909f1d90be266e0cfbdff328
parentce677831a4abd0f9f957c90ac6f6a0d0472bafb4
parente63233f75a1a6bfa97ffb52a20cc6801a4c63fb2
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
kernel/trace/trace.c