Re: linux-next: manual merge of the staging tree with the trivial andnet trees
From: Vitaliy Ivanov
Date: Tue Jun 21 2011 - 18:40:56 EST
On Tue, Jun 21, 2011 at 8:10 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e44ba033c565
> ("treewide: remove duplicate includes") from the trivial tree, commit
> 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> includes") from the net tree and various commits from the staging tree.
> I fixed them up (see below) and can carry the fix as necessary.
This one and all the others look good to me.
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/