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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Jun 2011 15:10:44 +1000

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.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/