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
..
brcmfmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
brcmsmac	bcma: move PCI IRQ control function to host specific code	2015-03-13 16:25:50 +02:00
brcmutil	brcmfmac: show firmware release info in ethtool driver info	2015-01-29 09:59:14 +02:00
include	brcmfmac: add support for BCM43430 SDIO chipset	2015-03-20 09:03:46 +02:00
Kconfig	brcmfmac: conditionally compile firmware protocol source code	2014-09-15 15:09:26 -04:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00