summaryrefslogtreecommitdiffstats
path: root/include/trace/events/block.h
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-11-16 10:10:12 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-11-16 10:10:12 +0100
commit5fbf85639287b6ea287f4f5e5e7e36608f0f60bd (patch)
tree608a51e6ee572dba94b43f1933e49ab88562e4c0 /include/trace/events/block.h
parentMerge branch 'v2.6.37-rc2' into for-2.6.38/core (diff)
parentblk-cgroup: Allow creation of hierarchical cgroups (diff)
downloadlinux-5fbf85639287b6ea287f4f5e5e7e36608f0f60bd.tar.xz
linux-5fbf85639287b6ea287f4f5e5e7e36608f0f60bd.zip
Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core
Diffstat (limited to 'include/trace/events/block.h')
0 files changed, 0 insertions, 0 deletions