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

From: Stephen Rothwell
Date: Wed Jun 09 2010 - 23:52:17 EST

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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature