forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/wireless/brcm80211/brcmfmac
History
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
bcdc.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
bcdc.h brcmfmac: conditionally compile firmware protocol source code 2014-09-15 15:09:26 -04:00
bcmsdh.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:47 -04:00
btcoex.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
btcoex.h brcmfmac: support critical protocol API for DHCP 2013-04-23 14:16:52 -04:00
bus.h brcmfmac: (clean) Rename dhd_bus.h in bus.h 2014-10-30 15:26:45 -04:00
cfg80211.c Merge commit '4e6ce4dc7c' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-11-19 15:38:48 -05:00
cfg80211.h brcmfmac: (clean) Rename files wl_cfg80211 to cfg80211 2014-10-30 15:26:46 -04:00
chip.c brcmfmac: (clean) Rename files dhd_dbg to debug 2014-10-30 15:26:44 -04:00
chip.h brcmfmac: make chip related functions host interface independent 2014-02-12 15:35:45 -05:00
common.c brcmfmac: (clean) Move sdio related function. 2014-10-30 15:26:48 -04:00
commonring.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
commonring.h brcmfmac: Adding msgbuf protocol. 2014-07-31 13:45:26 -04:00
core.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
core.h brcmfmac: (clean) Move sdio related function. 2014-10-30 15:26:48 -04:00
debug.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
debug.h brcmfmac: (clean) Rename files dhd_dbg to debug 2014-10-30 15:26:44 -04:00
feature.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
feature.h brcmfmac: Add wowl support for PCIE devices. 2014-09-30 13:17:48 -04:00
firmware.c net: brcm80211: Deletion of unnecessary checks before two function calls 2014-11-20 16:14:39 -05:00
firmware.h brcmfmac: Make firmware path a module parameter 2014-07-15 16:00:12 -04:00
flowring.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
flowring.h brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
fweh.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
fweh.h brcmfmac: handle IF event for P2P_DEVICE interface 2014-09-15 15:09:26 -04:00
fwil.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
fwil.h cfg80211: make connect ie param const 2014-02-04 21:48:10 +01:00
fwil_types.h brcmfmac: Add wowl patterns support. 2014-10-30 15:24:50 -04:00
fwsignal.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
fwsignal.h brcmfmac: Take bus flowcontrol at credit mgmt into account. 2013-06-12 15:02:16 -04:00
Makefile brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
msgbuf.c net: brcm80211: Deletion of unnecessary checks before two function calls 2014-11-20 16:14:39 -05:00
msgbuf.h brcmfmac: conditionally compile firmware protocol source code 2014-09-15 15:09:26 -04:00
of.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
of.h brcmfmac: add device tree support for SDIO devices 2014-07-29 10:32:56 -04:00
p2p.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
p2p.h brcmfmac: Add tx p2p off-channel support. 2013-02-08 14:51:43 -05:00
pcie.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
pcie.h brcmfmac: Adding PCIe bus layer support. 2014-07-31 13:45:26 -04:00
proto.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
proto.h brcmfmac: Add TDLS support to msgbuf. 2014-07-31 13:45:29 -04:00
sdio.c Merge commit '4e6ce4dc7c' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-11-19 15:38:48 -05:00
sdio.h brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:47 -04:00
tracepoint.c brcmfmac: (clean) Move tracepoint related function. 2014-10-30 15:26:38 -04:00
tracepoint.h brcmfmac: Use consistent naming for BCDC. 2013-12-02 14:25:25 -05:00
usb.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
usb.h
vendor.c brcmfmac: (clean) Rename sdio related files. 2014-10-30 15:26:48 -04:00
vendor.h brcmfmac: replace cfg80211 testmode with vendor command 2014-06-25 15:32:48 -04:00