Merge branch 'flushing' into for-linus
authorJames Bottomley <jbottomley@parallels.com>
Sun, 22 May 2011 07:04:55 +0000 (11:04 +0400)
committerJames Bottomley <jbottomley@parallels.com>
Sun, 22 May 2011 07:04:55 +0000 (11:04 +0400)

Trivial merge