aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:04:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:04:41 -0700
commit41cb6654eb2cf01476223a3742946b9f65bd1bbd (patch)
tree6874faea173541ef1692173b9984739e8254ffcc /block/blk-merge.c
parente69a9ac59629db81971a9e03048f9a107712947a (diff)
parent1ad0560e8cdb6d5b381220dc2da187691b5ce124 (diff)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf tools: Run generate-cmdlist.sh properly perf_event: Clean up perf_event_init_task() perf_event: Fix event group handling in __perf_event_sched_*() perf timechart: Add a power-only mode perf top: Add poll_idle to the skip list
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions