Merge branch 'flushing' into for-next
authorJames Bottomley <James.Bottomley@suse.de>
Fri, 15 Apr 2011 20:30:15 +0000 (15:30 -0500)
committerJames Bottomley <James.Bottomley@suse.de>
Fri, 15 Apr 2011 20:30:15 +0000 (15:30 -0500)

Trivial merge