Messages in this thread | | | Date | Thu, 28 Jun 2012 12:40:49 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the wireless-next tree with the net-next tree |
| |
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c between commit 2c208890c6d4 ("wireless: Remove casts to same type") from the net-next tree and commit d610cde30b00 ("brcmfmac: use firmware data buffer directly for nvram") from the wireless-next tree.
The latter removed the code modified by the former, so I used the latter. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |