OpenCloudOS-Kernel/drivers/net/wireless/iwlwifi/mvm
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
Makefile iwlwifi: mvm: move TDLS code to separate file 2014-09-14 22:02:24 +03:00
binding.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
coex.c Lots of updates for net-next; along with the usual flurry 2015-04-02 09:26:51 +03:00
coex_legacy.c iwlwifi: mvm: BT Coex - duplicate the command if sent ASYNC 2015-05-21 22:27:03 +03:00
constants.h iwlwifi: mvm: reduce quota threshold 2015-02-03 09:01:44 +02:00
d3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
debugfs-vif.c iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set 2015-03-07 19:40:02 +02:00
debugfs.c iwlwifi: mvm: add debugfs entry with the number of net-detect scans 2015-04-02 09:26:46 +03:00
debugfs.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
fw-api-coex.h iwlwifi: mvm: BT Coex - update the new API 2015-03-12 09:57:45 +02:00
fw-api-d3.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
fw-api-mac.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
fw-api-power.h iwlwifi: mvm: fix Tx Power firmware API 2015-04-19 17:06:20 +03:00
fw-api-rs.h iwlwifi: mvm: rs: enable forcing single stream Tx decision 2015-02-01 15:39:29 +02:00
fw-api-scan.h iwlwifi: mvm: some clean ups in fw-api-scan.h 2015-04-29 13:12:49 +03:00
fw-api-sta.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
fw-api-stats.h iwlwifi: mvm: support radio statistics as global survey 2015-03-01 16:55:09 +02:00
fw-api-tx.h iwlwifi: mvm: let the firmware configure the scheduler 2015-01-22 17:54:02 +02:00
fw-api.h iwlwifi: mvm: remove deprecated command IDs 2015-04-29 13:53:32 +03:00
fw.c iwlwifi: mvm: remove deprecated command IDs 2015-04-29 13:53:32 +03:00
led.c iwlwifi: mvm: don't fail completely if led mode is not supported 2014-03-16 08:59:05 +02:00
mac-ctxt.c iwlwifi: mvm: do string formatting in debug triggers 2015-04-02 09:29:13 +03:00
mac80211.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
mvm.h iwlwifi: mvm: make thermal throttling values configurable per NIC family 2015-04-29 13:57:11 +03:00
nvm.c iwlwifi: mvm: always reconfigure last MCC on init 2015-04-02 09:26:46 +03:00
offloading.c iwlwifi: mvm: remove IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID 2014-12-01 12:04:38 +02:00
ops.c iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx() 2015-05-21 22:36:46 +03:00
phy-ctxt.c iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
power.c * Location Aware Regulatory was added by Arik 2015-03-13 15:09:18 +02:00
quota.c iwlwifi: mvm: always update the quota after association 2015-03-12 09:57:34 +02:00
rs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
rs.h iwlwifi: rs: cleanup last_txrate_idx 2015-04-29 13:12:47 +03:00
rx.c iwlwifi: mvm: Avoid signal based decisions if ave beacon RSSI is 0 2015-04-19 17:06:57 +03:00
scan.c iwlwifi: mvm: include wildcard SSID in scans 2015-05-03 22:18:33 +03:00
sf.c iwlwifi: mvm: Always enable the smart FIFO 2015-03-12 09:57:47 +02:00
sta.c iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
sta.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
tdls.c iwlwifi: mvm: ignore stale TDLS ch-switch responses 2015-02-01 15:57:22 +02:00
testmode.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
time-event.c iwlwifi: mvm: capture connection loss as part of MLME trigger 2015-04-02 09:29:13 +03:00
time-event.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
tt.c iwlwifi: mvm: make thermal throttling values configurable per NIC family 2015-04-29 13:57:11 +03:00
tx.c * some more work on LAR 2015-04-07 19:55:57 +03:00
utils.c iwlwifi: mvm: capture connection loss as part of MLME trigger 2015-04-02 09:29:13 +03:00