On Sat, Jul 16, 2011 at 10:53:43PM +1000, Stephen Rothwell wrote:
> 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.
Thank you, that is the correct fix :)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
