linux-next: manual merge of the staging tree with Linus' tree

From: Stephen Rothwell
Date: Fri Mar 15 2013 - 00:13:51 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ccg/f_fs.c between commit 7f78e0351394 ("fs: Limit
sys_mount to only request filesystem modules") from Linus' tree and
commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the
staging tree.

The latter deleted the file, so I did that and can carry the fix as
necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature