On Wed, Jun 22, 2011 at 01:40:48AM +0300, Vitaliy Ivanov wrote:

Stephen,

On Tue, Jun 21, 2011 at 8:10 AM, Stephen Rothwell [off-list ref] wrote:

quoted

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.

Me too, thanks for doing this.

greg k-h