Eric Caruso <[email protected]> writes: > This is a new Broadcom chip and we should be able to recognize it. > > Signed-off-by: Eric Caruso <[email protected]>
This didn't apply. Please rebase on top of wireless-drivers-next and resend. Applying: brcm80211: Add support for brcm4371 Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/brcm80211/include/brcm_hw_ids.h CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/include/brcm_hw_ids.h Auto-merging drivers/net/wireless/brcm80211/brcmfmac/pcie.c CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/pcie.c Auto-merging drivers/net/wireless/brcm80211/brcmfmac/chip.c Failed to merge in the changes. Patch failed at 0001 brcm80211: Add support for brcm4371 -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
