diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 10:05:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 10:05:14 -0800 |
| commit | b0d78ee89c4ac1e99dda52f304baf82bd2a6c946 (patch) | |
| tree | 2aa8b6869b6daaefa1e7914849098337ce7f6283 /fs/ubifs | |
| parent | 6f12d2ee52dcf97dcefdadbd500e7650311eaa6a (diff) | |
| parent | 4eabc941259f9d8c8fb71746d3f30c87e1d9e49b (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
block: don't kick empty queue in blk_drain_queue()
block/swim3: Locking fixes
loop: Fix discard_alignment default setting
cfq-iosched: fix cfq_cic_link() race confition
cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
cciss: fix flush cache transfer length
cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
loop: fix loop block driver discard and encryption comment
block: initialize request_queue's numa node during
Diffstat (limited to 'fs/ubifs')
0 files changed, 0 insertions, 0 deletions