Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
commit6605f9ac69593d480324ba5fa05f64cfebf4db2f
authorIngo Molnar <mingo@kernel.org>
Thu, 22 Mar 2012 08:17:57 +0000 (22 09:17 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 Mar 2012 08:17:57 +0000 (22 09:17 +0100)
tree4c64d89d04ad24911d0eca7f3feb0012e4014dae
parentad2a8e6078a16d3b61b530f1447110841c36ae56
parent93d68e52295fb8b65ded6db49e32e63b6a203e0b
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent
include/linux/kernel.h