Re: linux-next: manual merge of the staging tree with Linus' tree
From: Greg KH
Date: Fri Apr 08 2011 - 17:45:17 EST
On Fri, Apr 08, 2011 at 03:47:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/README between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit 4a266c4fc99d ("staging:
> brcm80211: moved several README items to website") from the staging tree.
> The latter removed the text that the former fixed up, so I did that.
Thanks, it looks like the spelling changes hit a lot of staging stuff so
I will merge with Linus's tree and resolve them next week.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/