summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-24 17:42:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-24 17:42:35 +0200
commit5220cc9382e11ca955ce946ee6a5bac577bb14ff (patch)
tree7949f52a5ca0c7fa74ec8e49ba89a00d0e4114a9 /usr
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentblock: add REQ_SECURE to REQ_COMMON_MASK (diff)
downloadlinux-5220cc9382e11ca955ce946ee6a5bac577bb14ff.tar.xz
linux-5220cc9382e11ca955ce946ee6a5bac577bb14ff.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block: block: add REQ_SECURE to REQ_COMMON_MASK block: use the passed in @bdev when claiming if partno is zero block: Add __attribute__((format(printf...) and fix fallout block: make disk_block_events() properly wait for work cancellation block: remove non-syncing __disk_block_events() and fold it into disk_block_events() block: don't use non-syncing event blocking in disk_check_events() cfq-iosched: fix locking around ioc->ioc_data assignment
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions