summaryrefslogtreecommitdiffstats
path: root/include/trace/events/btrfs.h
diff options
context:
space:
mode:
authorIngo Molnar2011-10-04 11:08:16 +0200
committerIngo Molnar2011-10-04 11:09:08 +0200
commit22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch)
tree5c3f2346804a186aa2d954f078fd2f4d44bcc26e /include/trace/events/btrfs.h
parentsched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch (diff)
parentMerge branch 'hwmon-for-linus' of git://github.com/groeck/linux (diff)
downloadkernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.gz
kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.xz
kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.zip
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/events/btrfs.h')
0 files changed, 0 insertions, 0 deletions