summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-04 00:42:35 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-04 00:42:35 +0100
commitfb4b10ab5fadcf5012983e4306aec3131b808b1b (patch)
tree35433af7bb28850037c439136830e1c9ad3ce271 /net
parentMerge branch 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff)
parentblock: kill loop_mutex (diff)
downloadlinux-fb4b10ab5fadcf5012983e4306aec3131b808b1b.tar.xz
linux-fb4b10ab5fadcf5012983e4306aec3131b808b1b.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: kill loop_mutex blktrace: Remove blk_fill_rwbs_rq. block: blk-flush shouldn't call directly into q->request_fn() __blk_run_queue() block: add @force_kblockd to __blk_run_queue() block: fix kernel-doc format for blkdev_issue_zeroout blk-throttle: Do not use kblockd workqueue for throtl work
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions