leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c9d546f6c
linux/drivers/net/wireless/iwlwifi
History
David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-26 16:37:08 -04:00
..
dvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -04:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -04:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -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: mvm: add high temperature SKU thermal throttling parameters 2013-07-31 11:05:07 +02:00
iwl-agn-hw.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-config.h iwlwifi: mvm: add high temperature SKU thermal throttling parameters 2013-07-31 11:05:07 +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: reduce debug ifdefs using the optimiser 2013-06-13 12:05:50 +02: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 Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next 2013-06-25 12:20:16 +02:00
iwl-drv.h iwlwifi: include export.h instead of module.h 2013-06-11 20:16:26 +02: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: mvm: Change beacon filtering command 2013-07-31 11:05:03 +02:00
iwl-io.c iwlwifi: move dump_fh into common code 2013-07-16 13:12:54 +03:00
iwl-io.h iwlwifi: move dump_fh into common code 2013-07-16 13:12:54 +03:00
iwl-modparams.h iwlwifi: remove auto_agg module parameter 2013-06-18 11:51:56 +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: mvm: Enable user set TX power 2013-07-31 11:04:59 +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: fix some documentation typos 2013-08-06 10:33:58 +02:00
iwl-phy-db.c iwlwifi: remove calib channel section from PHY DB 2013-06-13 12:03:52 +02:00
iwl-phy-db.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-prph.h Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG" 2013-08-06 10:28:54 +02:00
iwl-trans.h iwlwifi: remove transport suspend/resume indirection 2013-08-06 10:34:33 +02:00
Kconfig iwlwifi: dvm: remove P2P support 2013-07-25 15:02:59 +02:00
Makefile iwlwifi: remove testmode 2013-06-18 11:51:57 +02:00