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
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
b43	Major changes:	2015-04-01 14:27:28 -04:00
b43legacy	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
cw1200	Major changes:	2015-04-01 14:27:28 -04:00
hostap	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ipw2x00	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
iwlegacy	Major changes:	2015-03-06 15:46:08 -05:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
libertas	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
libertas_tf	libertas_tf: if_usb.c: don't export static symbol	2015-03-13 16:12:18 +02:00
mwifiex	Major changes:	2015-04-01 14:27:28 -04:00
orinoco	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
p54	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
prism54
rsi	rsi: fix memory leak in rsi_load_ta_instructions()	2014-12-24 17:26:08 +02:00
rt2x00	rt2800usb: check Autorun mode on FW load only once	2015-03-30 11:29:16 +03:00
rtl818x
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
ti	Major changes:	2015-04-01 14:27:28 -04:00
zd1211rw
adm8211.c	adm8211: fix error return code	2015-01-15 14:44:42 +02:00
adm8211.h
airo_cs.c
airo.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
airo.h
at76c50x-usb.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
atmel.h
Kconfig
mac80211_hwsim.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
mac80211_hwsim.h
Makefile
mwl8k.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h