linux-next: manual merge of the staging tree with the trivial tree

From: Stephen Rothwell
Date: Tue Jun 21 2011 - 01:10:57 EST

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c and
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and various commits from the staging tree.

I think the final versions in the staging tree supercedes the change in
the trivial tree, so I used the staging tree versions.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature