diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
commit | 2e3ee613480563a6d5c01b57d342e65cc58c06df (patch) | |
tree | b6b82d1ade41f137bdb9a5a18d8aa446e149c8b2 /include/linux/i2c-pxa.h | |
parent | 1fad1e9a747687a7399bf58e87974f9b1bbcae06 (diff) | |
parent | 331cbdeedeb2f4ef01ccb761513708af0fe77098 (diff) | |
download | blackbird-op-linux-2e3ee613480563a6d5c01b57d342e65cc58c06df.tar.gz blackbird-op-linux-2e3ee613480563a6d5c01b57d342e65cc58c06df.zip |
Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback updates from Wu Fengguang:
"Use time based periods to age the writeback proportions, which can
adapt equally well to fast/slow devices."
Fix up trivial conflict in comment in fs/sync.c
* tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Fix some comment errors
block: Convert BDI proportion calculations to flexible proportions
lib: Fix possible deadlock in flexible proportion code
lib: Proportions with flexible period
Diffstat (limited to 'include/linux/i2c-pxa.h')
0 files changed, 0 insertions, 0 deletions