linux-next: manual merge of the staging tree with Linus' tree

From: Stephen Rothwell
Date: Fri Apr 08 2011 - 01:48:18 EST

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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature