iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
0b3d8e087b
linux/drivers/net/wireless/ath
History
David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-01 17:06:14 -04:00
..
ar5523 mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan 2013-03-25 19:19:35 +01:00
ath5k ath5k: debugfs: NULL-terminate strings 2013-08-26 14:09:06 -04:00
ath6kl ath: Remove extern from function prototypes 2013-09-24 16:52:29 -07:00
ath9k Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-01 17:06:14 -04:00
ath10k ath: Remove extern from function prototypes 2013-09-24 16:52:29 -07:00
carl9170 drivers/net: Convert uses of compare_ether_addr to ether_addr_equal 2013-09-03 22:28:04 -04:00
wil6210 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2013-08-28 13:51:40 -04:00
ath.h ath9k: Cleanup WLAN/BT RX diversity 2013-08-05 14:52:42 -04:00
debug.c
hw.c ath: update hardware mac address with bssid mask 2013-04-22 15:20:15 -04:00
Kconfig ath10k: mac80211 driver for Qualcomm Atheros 802.11ac CQA98xx devices 2013-06-12 20:52:10 +03:00
key.c ath: Let user know which keycache method is complaining. 2013-04-08 15:28:37 -04:00
main.c
Makefile ath10k: mac80211 driver for Qualcomm Atheros 802.11ac CQA98xx devices 2013-06-12 20:52:10 +03:00
reg.h ath: update hardware mac address with bssid mask 2013-04-22 15:20:15 -04:00
regd_common.h
regd.c ath: add VHT80 support for regulatory domains 2013-06-12 14:59:40 -04:00
regd.h wireless: make the reg_notifier() void 2013-01-14 11:32:44 +01:00