iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9f0d34bc34
linux/drivers/net/wireless/ath
History
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
..
ar5523 ar5523: use container_of 2015-03-13 16:07:00 +02:00
ath5k ath5k: fix reset race 2015-03-13 15:11:53 +02:00
ath6kl Lots of updates for net-next; along with the usual flurry 2015-03-31 16:39:04 -04:00
ath9k Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
ath10k Lots of updates for net-next; along with the usual flurry 2015-03-31 16:39:04 -04:00
carl9170 wireless: use %*pb[l] to print bitmaps including cpumasks and nodemasks 2015-02-13 21:21:38 -08:00
wcn36xx wcn36xx: initiate TX BA sessions 2015-01-23 19:12:12 +02:00
wil6210 Major changes: 2015-04-01 14:27:28 -04:00
ath.h ath9k_htc: add new WMI_REG_RMW_CMDID command 2015-03-30 11:31:18 +03:00
debug.c
dfs_pattern_detector.c ath9k: restart only triggering DFS detector line 2015-03-16 17:53:05 +02:00
dfs_pattern_detector.h
dfs_pri_detector.c
dfs_pri_detector.h
hw.c
Kconfig ath: Add support for tracing 2014-10-02 14:23:14 -04:00
key.c
main.c ath: Fix smatch warning 2014-10-07 14:48:37 -04:00
Makefile ath: Add support for tracing 2014-10-02 14:23:14 -04:00
reg.h
regd_common.h
regd.c ath: use CTL region from cfg80211 if unset in EEPROM 2014-10-23 14:02:06 -04:00
regd.h
spectral_common.h ath10k: add spectral scan feature 2014-08-04 09:07:54 +03:00
trace.c ath: Add support for tracing 2014-10-02 14:23:14 -04:00
trace.h ath: Add support for tracing 2014-10-02 14:23:14 -04:00