On Mon, May 10, 2010 at 03:15:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/rtl8187se/r8180_core.c between commit
> db8b06bcf94dbd02fba2601bee81ac4d9a626095
> ("param:remove-useless-writable-charp") from the rr tree and commit
> 3992db8fcb2ead240f311fc3e212443c5e1c43b9 ("Staging: rtl8187se: fix coding
> style issues in r8180_core.c") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
Thanks, the fix looks great.
greg k-h
--
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
