linux-next: manual merge of the drbd tree with the block trees

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drbd tree got a conflicts in
fs/fs-writeback.c against the block tree.

It looks like the block tree has moved under the drbd tree again.  I used
the version of this file from the block tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature