linux-next: manual merge of the staging tree with the trivial tree

From: Stephen Rothwell
Date: Sat Jul 16 2011 - 08:56:56 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/westbridge/astoria/gadget/cyasgadget.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and commit 78f23926dff9 ("Staging: delete westbridge code") from the
staging tree.

The latter removes the files, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature