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

From: Stephen Rothwell
Date: Fri Apr 08 2011 - 01:52:05 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c between commit
25985edcedea ("Fix common misspellings") from Linus' tree and commit
b3b97f5c23c0 ("staging/brcm80211: Fix common spelling mistakes") from the
staging tree.

The latter is a superset fo the former (for the conflicting line).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature