David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
bcdc.c	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
bcdc.h
bcmsdh.c	brcmfmac: add support for BCM43430 SDIO chipset	2015-03-20 09:03:46 +02:00
btcoex.c	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
btcoex.h
bus.h	brcmfmac: Reopen netdev queue on bus state data.	2015-01-29 09:59:05 +02:00
cfg80211.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
cfg80211.h	brcmfmac: enable 802.11d support in firmware	2015-01-06 20:30:16 +02:00
chip.c	brcmfmac: add support for BCM43430 SDIO chipset	2015-03-20 09:03:46 +02:00
chip.h	brcmfmac: extract ram size info from internal memory registers	2015-03-13 16:10:33 +02:00
common.c	brcmfmac: store revinfo retrieval result	2015-01-29 09:59:17 +02:00
common.h	brcmfmac: signal completion of 802.1x.	2015-01-06 20:29:57 +02:00
commonring.c	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
commonring.h	brcmfmac: Relax scheduling of msgbuf worker on high throughput.	2015-01-29 09:58:49 +02:00
core.c	brcmfmac: add debugfs file containing revision info	2015-02-26 15:14:18 +02:00
core.h	brcmfmac: store revinfo retrieval result	2015-01-29 09:59:17 +02: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: disable MBSS feature for BCM43362	2015-03-21 08:36:07 +02:00
feature.h	brcmfmac: add multiple BSS support.	2014-12-04 11:35:03 -05:00
firmware.c	brcmfmac: fix nvram processing	2015-01-29 10:00:19 +02:00
firmware.h
flowring.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
flowring.h
fweh.c	brcmfmac: add multiple BSS support.	2014-12-04 11:35:03 -05:00
fweh.h
fwil_types.h	brcmfmac: determine chip info when not provided by bus layer	2015-01-29 09:59:11 +02:00
fwil.c	brcmfmac: SDIO: avoid using bus state for private states.	2015-01-29 09:59:03 +02:00
fwil.h	brcmfmac: determine chip info when not provided by bus layer	2015-01-29 09:59:11 +02:00
fwsignal.c	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
fwsignal.h
Makefile	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
msgbuf.c	brcmfmac: Fix race condition in msgbuf ioctl processing.	2015-03-13 15:16:36 +02:00
msgbuf.h	brcmfmac: Update msgbuf commonring size for improved throughput.	2015-03-20 09:03:39 +02:00
of.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-12-08 13:58:58 -05:00
of.h
p2p.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
p2p.h	cfg80211: pass name_assign_type to rdev_add_virtual_intf()	2015-03-30 10:36:17 +02:00
pcie.c	brcmfmac: remove support for unreleased BCM4354 PCIe	2015-03-20 09:03:50 +02:00
pcie.h
proto.c	brcmfmac: (clean) Rename sdio related files.	2014-10-30 15:26:48 -04:00
proto.h
sdio.c	brcmfmac: only support the BCM43455/7 device	2015-03-20 09:03:48 +02:00
sdio.h	brcmfmac: make sdio suspend wait for threads to freeze	2015-02-26 15:14:19 +02:00
tracepoint.c	brcmfmac: (clean) Move tracepoint related function.	2014-10-30 15:26:38 -04:00
tracepoint.h
usb.c	brcm80211: Delete unnecessary checks before two function calls	2015-02-06 08:52:50 +02:00
usb.h
vendor.c	brcmfmac: Perform bound checking on vendor command buffer	2015-03-07 10:52:30 +02:00
vendor.h