leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1f6d80358d
linux/drivers/net/wireless/iwlwifi
History
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
..
dvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
iwl-1000.c iwlwifi: don't disable SCD chain extension on newer devices 2014-04-13 22:23:20 +03:00
iwl-2000.c iwlwifi: don't disable SCD chain extension on newer devices 2014-04-13 22:23:20 +03:00
iwl-5000.c iwlwifi: don't disable SCD chain extension on newer devices 2014-04-13 22:23:20 +03:00
iwl-6000.c iwlwifi: don't disable SCD chain extension on newer devices 2014-04-13 22:23:20 +03:00
iwl-7000.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
iwl-8000.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-09-08 11:14:56 -04: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: add PCI IDs and add then new 3165 series 2014-09-08 19:47:16 +03:00
iwl-csr.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03: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 some debugging to quota allocation 2014-09-03 22:49:03 +03:00
iwl-devtrace.c iwlwifi: don't export tracepoints unnecessarily 2014-09-03 22:49:03 +03:00
iwl-devtrace.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-drv.c iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-drv.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-eeprom-parse.c iwlwifi: remove MCS32 support declaration 2014-06-24 21:55:25 +03: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-error-dump.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-fw-file.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-fw.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-io.c iwlwifi: update nmi register 2014-05-15 19:50:51 +03:00
iwl-io.h iwlwifi: update nmi register 2014-05-15 19:50:51 +03:00
iwl-modparams.h iwlwifi: fix inconsistency about power_save module parameter 2014-07-22 19:21:10 +03: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 2014-09-23 12:09:27 -04: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: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-phy-db.c iwlwifi: remove CMD_SYNC 2014-05-13 13:52:19 +03:00
iwl-phy-db.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-prph.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
iwl-scd.h iwlwifi: trans: configure the scheduler enable register 2014-09-03 22:49:06 +03:00
iwl-trans.h iwlwifi: add Intel Mobile Communications copyright 2014-09-03 22:49:07 +03:00
Kconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-09-08 11:14:56 -04:00
Makefile iwlwifi: Add 8000 HW family support 2014-02-03 22:23:31 +02:00