diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-16 19:33:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-16 19:33:41 +0200 |
commit | d733ed6c34be3aef0517a04e4103eed6b369ec50 (patch) | |
tree | b49723304c48c2f877b9cb284a4b39361934c670 /crypto/cts.c | |
parent | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
parent | block: make unplug timer trace event correspond to the schedule() unplug (diff) | |
download | linux-d733ed6c34be3aef0517a04e4103eed6b369ec50.tar.xz linux-d733ed6c34be3aef0517a04e4103eed6b369ec50.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: make unplug timer trace event correspond to the schedule() unplug
block: let io_schedule() flush the plug inline
Diffstat (limited to 'crypto/cts.c')
0 files changed, 0 insertions, 0 deletions