leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51217cee3a
linux/drivers/net/wireless/iwlwifi
History
Johannes Berg 51217cee3a Merge remote-tracking branch 'wireless-next/master' into HEAD 
Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2013-06-04 13:02:42 +02:00
..
dvm Merge remote-tracking branch 'wireless-next/master' into HEAD 2013-06-04 13:02:42 +02:00
mvm Merge remote-tracking branch 'wireless-next/master' into HEAD 2013-06-04 13:02:42 +02:00
pcie Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2013-05-29 14:51:50 -04:00
iwl-1000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-2000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-5000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-6000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-7000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-agn-hw.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-config.h iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-csr.h iwlwifi: mvm: add thermal throttling and CT kill 2013-05-29 09:03:18 +02:00
iwl-debug.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-debug.h iwlwifi: add the MVM driver 2013-02-01 11:27:15 +01:00
iwl-devtrace.c iwlwifi: update copyright 2013-01-24 13:00:55 +01:00
iwl-devtrace.h iwlwifi: use __get_str in tracing 2013-03-06 16:47:27 +01:00
iwl-drv.c iwlwifi: support loading NVM data from file 2013-05-16 23:16:59 +02:00
iwl-drv.h iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-eeprom-parse.c iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-eeprom-parse.h iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-eeprom-read.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-eeprom-read.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fh.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fw-file.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fw.h iwlwifi: reverse DATA/INST section order 2013-05-16 23:14:24 +02:00
iwl-io.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-io.h iwlwifi: add iwl_set_bits_mask to transport API 2013-02-01 11:27:22 +01:00
iwl-modparams.h iwlwifi: support loading NVM data from file 2013-05-16 23:16:59 +02:00
iwl-notif-wait.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-notif-wait.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-nvm-parse.c iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-nvm-parse.h iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-op-mode.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-phy-db.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-phy-db.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-prph.h iwlwifi: mvm: add thermal throttling and CT kill 2013-05-29 09:03:18 +02:00
iwl-test.c iwlwifi: use kmemdup instead of kmalloc+memcpy 2013-03-20 14:17:07 +01:00
iwl-test.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-testmode.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-trans.h iwlwifi: fix initialisation while RF-kill is asserted 2013-05-16 23:17:29 +02:00
Kconfig iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
Makefile iwlwifi: make device configuration bus agnostic 2013-03-06 16:47:54 +01:00