summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-07 22:22:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-07 22:22:26 +0200
commit2a9d6df425d7b46b23cbc8673b2dfefa4678abdb (patch)
treea6ec2ee125a3c02342b48a2e4a36598c26ca2b8b /kernel
parentFS-Cache: Add a helper to bulk uncache pages on an inode (diff)
parentMerge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into fo... (diff)
downloadlinux-2a9d6df425d7b46b23cbc8673b2dfefa4678abdb.tar.xz
linux-2a9d6df425d7b46b23cbc8673b2dfefa4678abdb.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block: drbd: we should write meta data updates with FLUSH FUA drbd: fix limit define, we support 1 PiByte now drbd: when receive times out on meta socket, also check last receive time on data socket drbd: account bitmap IO during resync as resync-(related-)-io drbd: don't cond_resched_lock with IRQs disabled drbd: add missing spinlock to bitmap receive drbd: Use the correct max_bio_size when creating resync requests cfq-iosched: make code consistent cfq-iosched: fix a rcu warning
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions