summaryrefslogtreecommitdiffstats
path: root/crypto/cts.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-16 19:33:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-16 19:33:41 +0200
commitd733ed6c34be3aef0517a04e4103eed6b369ec50 (patch)
treeb49723304c48c2f877b9cb284a4b39361934c670 /crypto/cts.c
parentMerge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff)
parentblock: make unplug timer trace event correspond to the schedule() unplug (diff)
downloadlinux-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