David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
binding.c	iwlwifi: Update Copyright to 2014	2013-12-31 19:03:53 +02:00
coex_legacy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
coex.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
constants.h	iwlwifi: mvm: reduce quota threshold	2015-02-03 09:01:44 +02:00
d3.c	iwlwifi: mvm: don't iterate interfaces to disconnect in net-detect	2015-03-02 08:19:32 +02: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 the cause of the firmware dump in the dump	2015-03-02 08:20:28 +02: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 - add support for TTC / RRC	2014-11-23 20:05:06 +02:00
fw-api-d3.h	iwlwifi: mvm: remove IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID	2014-12-01 12:04:38 +02:00
fw-api-mac.h	iwlwifi: mvm: add statistics API version 10	2015-03-01 16:55:08 +02:00
fw-api-power.h	iwlwifi: mvm: add support for new LTR command	2015-01-22 17:55:16 +02: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: remove deprecated scan API code	2015-03-01 16:55:10 +02: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: new Alive / error table API	2015-03-01 16:55:12 +02:00
fw.c	iwlwifi: mvm: restart firmware recording when no configuration is set	2015-03-02 08:20:31 +02:00
led.c	iwlwifi: mvm: don't fail completely if led mode is not supported	2014-03-16 08:59:05 +02:00
mac80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
mac-ctxt.c	iwlwifi: mvm: add trigger for firmware dump upon missed beacons	2015-03-02 08:20:29 +02:00
Makefile	iwlwifi: mvm: move TDLS code to separate file	2014-09-14 22:02:24 +03:00
mvm.h	iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set	2015-03-07 19:40:02 +02:00
nvm.c	iwlwifi: mvm: support family 8000 C step	2015-01-22 17:55:20 +02: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: add trigger for firmware dump upon command response	2015-03-02 08:20:30 +02:00
phy-ctxt.c	iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set	2015-03-07 19:40:02 +02:00
power.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
quota.c	iwlwifi: mvm: fix quota update avoidance	2014-09-14 22:02:23 +03:00
rs.c	iwlwifi: mvm: rs: print single stream params via debugfs	2015-03-01 16:55:06 +02:00
rs.h	iwlwifi: mvm: rs: avoid ss_force from being reset after tx idle	2015-03-01 16:55:05 +02:00
rx.c	iwlwifi: mvm: add trigger for firmware dump upon low RSSI	2015-03-02 08:20:32 +02:00
scan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
sf.c	iwlwifi: mvm: allow preventing dummy notifications	2014-09-14 12:56:37 +03:00
sta.c	iwlwifi: allow to define the stuck queue timer per queue	2015-02-01 15:57:23 +02:00
sta.h	iwlwifi: mvm: add CSA absent time event for clients	2014-11-24 08:30:31 +02: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: Fix ROC removal	2015-02-23 22:42:37 +02:00
time-event.h	iwlwifi: mvm: add remove flow for AUX ROC time events	2014-11-24 08:30:14 +02:00
tt.c	iwlwifi: mvm: clear tt values when entering CT-kill	2014-12-28 20:00:15 +02:00
tx.c	iwlwifi: mvm: rs: better match tx response rate to the LQ table	2015-02-23 22:08:07 +02:00
utils.c	iwlwifi: mvm: new Alive / error table API	2015-03-01 16:55:12 +02:00