diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 13:01:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 13:01:58 -0800 |
| commit | 6dc39c50e4aeb769c8ae06edf2b1a732f3490913 (patch) | |
| tree | 2df396e0b3cb3827a1f8a321bb49b202ea7515d6 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'powerpc-4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | cfq-iosched: don't call wbt_disable_default() with IRQs disabled (diff) | |
| download | linux-6dc39c50e4aeb769c8ae06edf2b1a732f3490913.tar.gz linux-6dc39c50e4aeb769c8ae06edf2b1a732f3490913.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fix from Jens Axboe:
"A single fix for a lockdep splat reported by Thomas and Gabriel"
* 'for-linus' of git://git.kernel.dk/linux-block:
cfq-iosched: don't call wbt_disable_default() with IRQs disabled
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions