From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Jul 2012 05:14:04 +0000 (-0700)
Subject: Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e3ee613480563a6d5c01b57d342e65cc58c06df;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'writeback-proportions' of git://git./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
---

2e3ee613480563a6d5c01b57d342e65cc58c06df