• Linus Torvalds's avatar
    Merge branch 'tracing-fixes-for-linus' of... · c93f216b
    Linus Torvalds authored
    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
      branch tracer: Fix for enabling branch profiling makes sparse unusable
      ftrace: Correct a text align for event format output
      Update /debug/tracing/README
      tracing/ftrace: alloc the started cpumask for the trace file
      tracing, x86: remove duplicated #include
      ftrace: Add check of sched_stopped for probe_sched_wakeup
      function-graph: add proper initialization for init task
      tracing/ftrace: fix missing include string.h
      tracing: fix incorrect return type of ns2usecs()
      tracing: remove CALLER_ADDR2 from wakeup tracer
      blktrace: fix pdu_len when tracing packet command requests
      blktrace: small cleanup in blk_msg_write()
      blktrace: NUL-terminate user space messages
      tracing: move scripts/trace/power.pl to scripts/tracing/power.pl
blk-core.c 58.1 KB