linux_dsm_epyc7002/drivers/net/wireless/brcm80211/brcmfmac
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
..
bcdc.c brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
bcdc.h brcmfmac: conditionally compile firmware protocol source code 2014-09-15 15:09:26 -04:00
bcmsdh.c brcmfmac: Fix OOB interrupt not working for BCM43362 2014-07-29 10:32:57 -04:00
btcoex.c brcmfmac: correct logging levels in btcoex source 2014-06-25 15:32:48 -04:00
btcoex.h brcmfmac: support critical protocol API for DHCP 2013-04-23 14:16:52 -04:00
chip.c brcmfmac: Adding PCIe bus layer support. 2014-07-31 13:45:26 -04:00
chip.h brcmfmac: make chip related functions host interface independent 2014-02-12 15:35:45 -05:00
commonring.c brcmfmac: Adding msgbuf protocol. 2014-07-31 13:45:26 -04:00
commonring.h brcmfmac: Adding msgbuf protocol. 2014-07-31 13:45:26 -04:00
dhd_bus.h brcmfmac: Adding PCIe bus layer support. 2014-07-31 13:45:26 -04:00
dhd_common.c brcmfmac: Don't control mpc setting during scan operation 2014-06-25 15:32:48 -04:00
dhd_dbg.c brcmfmac: rework debugfs functions in the driver 2014-07-15 16:00:11 -04:00
dhd_dbg.h brcmfmac: Adding PCIe bus layer support. 2014-07-31 13:45:26 -04:00
dhd_linux.c Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2014-08-05 13:18:20 -07:00
dhd_sdio.c brcmfmac: Do not use strcpy and strcat 2014-07-31 13:41:44 -04:00
dhd.h brcmfmac: Fix msgbuf flow control. 2014-07-31 13:45:28 -04:00
feature.c brcmfmac: introduce feature and quirk handling 2014-07-15 16:00:13 -04:00
feature.h brcmfmac: introduce feature and quirk handling 2014-07-15 16:00:13 -04:00
firmware.c brcmfmac: Make firmware path a module parameter 2014-07-15 16:00:12 -04:00
firmware.h brcmfmac: Make firmware path a module parameter 2014-07-15 16:00:12 -04:00
flowring.c brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
flowring.h brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
fweh.c brcmfmac: handle IF event for P2P_DEVICE interface 2014-09-15 15:09:26 -04:00
fweh.h brcmfmac: handle IF event for P2P_DEVICE interface 2014-09-15 15:09:26 -04:00
fwil_types.h brcmfmac: Give priority to 5GHz band in selecting target BSS 2014-05-13 15:56:43 -04:00
fwil.c brcmfmac: reduce log level in fwil if firmware returns error 2014-06-25 15:32:48 -04:00
fwil.h cfg80211: make connect ie param const 2014-02-04 21:48:10 +01:00
fwsignal.c brcmfmac: rework debugfs functions in the driver 2014-07-15 16:00:11 -04:00
fwsignal.h brcmfmac: Take bus flowcontrol at credit mgmt into account. 2013-06-12 15:02:16 -04:00
Makefile brcmfmac: conditionally compile firmware protocol source code 2014-09-15 15:09:26 -04:00
msgbuf.c brcmfmac: fix memory leakage in msgbuf 2014-08-11 14:43:51 -04:00
msgbuf.h brcmfmac: conditionally compile firmware protocol source code 2014-09-15 15:09:26 -04:00
of.c brcmfmac: add device tree support for SDIO devices 2014-07-29 10:32:56 -04:00
of.h brcmfmac: add device tree support for SDIO devices 2014-07-29 10:32:56 -04:00
p2p.c cfg80211: remove @gfp parameter from cfg80211_rx_mgmt() 2014-08-26 11:15:58 +02:00
p2p.h brcmfmac: Add tx p2p off-channel support. 2013-02-08 14:51:43 -05:00
pcie.c brcmfmac: fix curly brace mistake in brcmf_pcie_handle_mb_data() 2014-08-11 14:43:51 -04:00
pcie.h brcmfmac: Adding PCIe bus layer support. 2014-07-31 13:45:26 -04:00
proto.c brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
proto.h brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
sdio_host.h brcmfmac: Fix some wrong register defines 2014-07-29 10:32:56 -04:00
tracepoint.c brcmfmac: introduce tracepoints for message logging 2013-03-06 16:28:31 -05:00
tracepoint.h brcmfmac: Use consistent naming for BCDC. 2013-12-02 14:25:25 -05:00
usb_rdl.h brcm80211: fmac: add USB support for bcm43235/6/8 chipsets 2012-02-22 14:48:53 -05:00
usb.c brcmfmac: Cleanup used device IDs. 2014-07-15 16:00:09 -04:00
usb.h brcmfmac: usb suspend/resume. 2012-11-16 14:28:47 -05:00
vendor.c brcmfmac: replace cfg80211 testmode with vendor command 2014-06-25 15:32:48 -04:00
vendor.h brcmfmac: replace cfg80211 testmode with vendor command 2014-06-25 15:32:48 -04:00
wl_cfg80211.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
wl_cfg80211.h net/wireless/brcm80211/brcmfmac: Make return type and name reflect actual semantics 2014-06-25 15:32:47 -04:00