hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/net/wireless/iwlwifi
History
David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-06-12 21:59:18 -07:00
..
dvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
Kconfig iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
Makefile iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-agn-hw.h iwlwifi: move OTP defines 2012-04-23 14:30:01 -07:00
iwl-config.h iwlwifi: fix typo 'IWL_WATCHHDOG_DISABLED' 2012-06-06 13:24:36 +02:00
iwl-csr.h iwlwifi: configure the SKU in the HW 2012-06-06 13:22:30 +02:00
iwl-debug.c iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
iwl-debug.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-devtrace.c iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
iwl-devtrace.h iwlwifi: move DVM code into subdirectory 2012-06-06 13:21:14 +02:00
iwl-drv.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-06 14:40:06 -04:00
iwl-drv.h iwlwifi: move driver defines to iwl-drv.h 2012-04-23 14:29:02 -07:00
iwl-eeprom-parse.c iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-parse.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-read.c iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-read.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-fh.h iwlwifi: fix hardware queue programming 2012-04-24 14:14:55 -04:00
iwl-fw-file.h iwlwifi: remove uCode alternatives mechanism 2012-04-16 14:34:44 -07:00
iwl-fw.h iwlwifi: include net/mac80211.h to avoid compiler error 2012-04-23 14:21:53 -07:00
iwl-io.c iwlwifi: add iwl_set_bits_mask 2012-06-06 13:21:52 +02:00
iwl-io.h iwlwifi: add iwl_set_bits_mask 2012-06-06 13:21:52 +02:00
iwl-modparams.h iwlwifi: remove the iwl_shared reference 2012-05-08 21:53:44 -04:00
iwl-notif-wait.c iwlwifi: move notification wait into core 2012-06-05 15:32:14 -04:00
iwl-notif-wait.h iwlwifi: extend notification wait 2012-04-09 16:37:15 -04:00
iwl-op-mode.h iwlwifi: remove extern opmode ops declarations 2012-06-06 13:26:00 +02:00
iwl-prph.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
iwl-trans.h iwlwifi: allocate Tx cmd pool per device 2012-06-06 13:21:22 +02:00