Messages in this thread | | | Date | Thu, 13 Oct 2011 16:43:53 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the net tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in drivers/staging/brcm80211/brcmfmac/dhd_linux.c and drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove brcm80211 driver from the staging tree") from the staging tree.
The latter removed the files, so I did that -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |