Messages in this thread | | | Date | Thu, 13 Oct 2011 17:20:05 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the staging tree |
| |
Hi Paul,
Today's linux-next merge of the moduleh tree got conflicts in drivers/staging/brcm80211/brcmfmac/bcmsdh.c, drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c, drivers/staging/brcm80211/brcmfmac/dhd_linux.c and drivers/staging/brcm80211/brcmfmac/dhd_sdio.c between commit fc2d6e573be6 ("staging: brcm80211: remove brcm80211 driver from the staging tree") from the staging tree and commits from the moduleh tree.
The former 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] | |