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 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2014-03-14 22:31:55 -04:00
..
dvm Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-03-04 13:05:12 -05:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-14 22:31:55 -04:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-14 22:31:55 -04:00
Kconfig iwlwifi: rs: use const u16 for throughput tables 2014-02-03 22:23:37 +02:00
Makefile iwlwifi: Add 8000 HW family support 2014-02-03 22:23:31 +02:00
iwl-1000.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-2000.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-5000.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-6000.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-7000.c iwlwifi: 7265: add power limit/tx backoff translation table 2014-02-03 22:23:38 +02:00
iwl-8000.c iwlwifi: 8000: add 11n only SKU of 8000 devices 2014-02-06 21:11:30 +02:00
iwl-agn-hw.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-config.h iwlwifi: 8000: add 11n only SKU of 8000 devices 2014-02-06 21:11:30 +02:00
iwl-csr.h iwlwifi: pcie: fix secure section / dual cpu firmware loading 2014-02-03 22:23:32 +02:00
iwl-debug.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-debug.h iwlwifi: add enter/exit D0i3 ops 2014-02-03 22:23:39 +02:00
iwl-devtrace.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-devtrace.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-drv.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-03-04 13:05:12 -05:00
iwl-drv.h iwlwifi: mvm: new NVM format in family 8000 2014-02-13 13:49:37 +02:00
iwl-eeprom-parse.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-eeprom-parse.h iwlwifi: mvm: new NVM format in family 8000 2014-02-13 13:49:37 +02:00
iwl-eeprom-read.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-eeprom-read.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-fh.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-fw-file.h iwlwifi: mvm: prepare infrastructure for more TLV flags 2014-02-23 21:32:22 +02:00
iwl-fw.h iwlwifi: mvm: prepare infrastructure for more TLV flags 2014-02-23 21:32:22 +02:00
iwl-io.c iwlwifi: pcie: fix secure section / dual cpu firmware loading 2014-02-03 22:23:32 +02:00
iwl-io.h iwlwifi: pcie: fix secure section / dual cpu firmware loading 2014-02-03 22:23:32 +02:00
iwl-modparams.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-03-04 13:05:12 -05: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 branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next 2014-02-24 15:05:42 -05:00
iwl-nvm-parse.h iwlwifi: mvm: new NVM format in family 8000 2014-02-13 13:49:37 +02:00
iwl-op-mode.h iwlwifi: fix kerneldoc format 2014-02-03 22:43:51 +02:00
iwl-phy-db.c iwlwifi: change number of PAPD groups in PHY DB 2014-02-06 21:12:26 +02:00
iwl-phy-db.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-prph.h iwlwifi: pcie: fix secure section / dual cpu firmware loading 2014-02-03 22:23:32 +02:00
iwl-trans.h iwlwifi: make various things const 2014-02-13 10:18:43 +02:00