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
..
Kconfig	…
Makefile	…
aes_ccm.c	mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt()	2015-03-30 10:40:03 +02:00
aes_ccm.h	…
aes_cmac.c	…
aes_cmac.h	…
aes_gcm.c	mac80111: aes_gcm: clean up ieee80211_aes_gcm_key_setup_encrypt()	2015-03-30 10:42:02 +02:00
aes_gcm.h	…
aes_gmac.c	mac80211: Fix misplaced return in AES-GMAC key setup	2015-03-30 10:38:07 +02:00
aes_gmac.h	…
agg-rx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
agg-tx.c	mac80211: reject aggregation sessions with non-HT peers	2015-03-30 10:33:19 +02:00
cfg.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
cfg.h	…
chan.c	…
debug.h	…
debugfs.c	mac80211: remove drop_unencrypted code	2015-03-20 11:37:36 +01:00
debugfs.h	…
debugfs_key.c	…
debugfs_key.h	…
debugfs_netdev.c	mac80211: remove drop_unencrypted code	2015-03-20 11:37:36 +01:00
debugfs_netdev.h	…
debugfs_sta.c	…
debugfs_sta.h	…
driver-ops.h	mac80211: convert rssi_callback() to event_callback()	2015-03-30 10:17:09 +02:00
ethtool.c	…
event.c	…
ht.c	mac80211: add VHT support for IBSS	2015-03-30 10:48:26 +02:00
ibss.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
ieee80211_i.h	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
iface.c	cfg80211: pass name_assign_type to rdev_add_virtual_intf()	2015-03-30 10:36:17 +02:00
key.c	mac80211: Get IV len from key conf and not cipher scheme	2015-03-17 12:34:26 +01:00
key.h	mac80211: Get IV len from key conf and not cipher scheme	2015-03-17 12:34:26 +01:00
led.c	…
led.h	…
main.c	cfg80211: pass name_assign_type to rdev_add_virtual_intf()	2015-03-30 10:36:17 +02:00
mesh.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
mesh.h	…
mesh_hwmp.c	…
mesh_pathtbl.c	…
mesh_plink.c	mac80211: add VHT support for IBSS	2015-03-30 10:48:26 +02:00
mesh_ps.c	…
mesh_sync.c	…
michael.c	…
michael.h	…
mlme.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
ocb.c	…
offchannel.c	…
pm.c	mac80211: start queues if driver rejected wowlan	2015-03-04 10:34:09 +01:00
rate.c	…
rate.h	…
rc80211_minstrel.c	…
rc80211_minstrel.h	…
rc80211_minstrel_debugfs.c	…
rc80211_minstrel_ht.c	mac80211: minstrel_ht: fix rounding issue in MCS duration calculation	2015-03-17 11:03:30 +01:00
rc80211_minstrel_ht.h	…
rc80211_minstrel_ht_debugfs.c	…
rx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
scan.c	mac80211: IBSS fix scan request	2015-03-30 10:47:56 +02:00
spectmgmt.c	…
sta_info.c	mac80211: avoid duplicate TX path station lookup	2015-03-20 16:27:36 +01:00
sta_info.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
status.c	…
tdls.c	mac80211: send HT/VHT IEs in TDLS discovery response	2015-03-30 10:48:59 +02:00
tkip.c	…
tkip.h	…
trace.c	…
trace.h	mac80211: convert rssi_callback() to event_callback()	2015-03-30 10:17:09 +02:00
tx.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
util.c	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
vht.c	…
wep.c	…
wep.h	…
wme.c	…
wme.h	…
wpa.c	mac80211: Get IV len from key conf and not cipher scheme	2015-03-17 12:34:26 +01:00
wpa.h	…