UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/wireless/iwlwifi
History
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
..
dvm iwlwifi: dvm: don't sleep in event_callback callback 2015-04-24 12:25:00 +02:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
Makefile iwlwifi: Add 8000 HW family support 2014-02-03 22:23:31 +02:00
iwl-1000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-2000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-5000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-6000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-7000.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
iwl-8000.c iwlwifi: 8000: change PNVM in case it doesn't match to the HW step 2015-03-30 08:58:08 +03:00
iwl-agn-hw.h iwlwifi: mvm: fix bug with OTP memory size 2014-05-06 20:40:01 +03:00
iwl-config.h iwlwifi: mvm: make thermal throttling values configurable per NIC family 2015-04-29 13:57:11 +03:00
iwl-csr.h iwlwifi: mvm: support family 8000 C step 2015-01-22 17:55:20 +02:00
iwl-debug.c iwlwifi: use dev_printk instead of dev_dbg for debug logs 2014-05-13 13:52:22 +03:00
iwl-debug.h iwlwifi: mvm: add MCC update FW API 2015-03-12 09:57:21 +02:00
iwl-devtrace-data.h iwlwifi: Move each system tracepoints to their own header 2015-04-08 09:38:49 -04:00
iwl-devtrace-io.h iwlwifi: Move each system tracepoints to their own header 2015-04-08 09:38:49 -04:00
iwl-devtrace-iwlwifi.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
iwl-devtrace-msg.h iwlwifi: Move each system tracepoints to their own header 2015-04-08 09:38:49 -04:00
iwl-devtrace-ucode.h iwlwifi: Move each system tracepoints to their own header 2015-04-08 09:38:49 -04:00
iwl-devtrace.c iwlwifi: don't export tracepoints unnecessarily 2014-09-03 22:49:03 +03:00
iwl-devtrace.h iwlwifi: Move each system tracepoints to their own header 2015-04-08 09:38:49 -04:00
iwl-drv.c * some more work on LAR 2015-04-07 19:55:57 +03:00
iwl-drv.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
iwl-eeprom-parse.c iwlwifi: mvm: forbid MIMO on devices that don't support it 2015-05-10 11:44:42 +03:00
iwl-eeprom-parse.h iwlwifi: mvm: forbid MIMO on devices that don't support it 2015-05-10 11:44:42 +03:00
iwl-eeprom-read.c iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
iwl-eeprom-read.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-fh.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
iwl-fw-error-dump.h iwlwifi: mvm: add trigger for time events 2015-04-02 09:29:13 +03:00
iwl-fw-file.h iwlwifi: allow to limit the size of the external buffer for firmware debugging 2015-04-29 13:53:20 +03:00
iwl-fw.h iwlwifi: mvm: add framework for triggers for fw dump 2015-03-02 08:20:28 +02:00
iwl-io.c iwlwifi: drop support for early versions of 8000 2015-03-26 09:15:36 +02:00
iwl-io.h iwlwifi: update nmi register 2014-05-15 19:50:51 +03:00
iwl-modparams.h iwlwifi: allow disabling LAR via module param 2015-03-12 09:57:29 +02:00
iwl-notif-wait.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-notif-wait.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-nvm-parse.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
iwl-nvm-parse.h iwlwifi: drop support for early versions of 8000 2015-03-26 09:15:36 +02:00
iwl-op-mode.h iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
iwl-phy-db.c iwlwifi: fix spelling errors 2015-04-02 09:29:13 +03:00
iwl-phy-db.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-prph.h iwlwifi: pcie: support marbh fw dbg mode 2015-04-29 13:12:49 +03:00
iwl-scd.h iwlwifi: pcie: prepare the enablement of 31 TFD queues 2015-02-01 15:57:20 +02:00
iwl-trans.h iwlwifi: mvm: don't power off the device between INIT and OPER firmwares 2015-04-28 14:58:51 +03:00