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

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
("treewide: Convert uses of struct resource to resource_size(ptr)") from
the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
drivers") from the staging tree.

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

Attachment: pgp00000.pgp
Description: PGP signature