David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
dvm	This relatively large batch of changes is comprised of the	2014-11-04 16:18:12 -05:00
mvm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
pcie	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05: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	iwlwifi: define the non shared antenna per hardware	2014-09-14 12:56:39 +03:00
iwl-8000.c	iwlwifi: enable STBC support for 8000 chips	2014-10-29 13:07:35 +02: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: always run the secured flow for family 8000	2014-10-29 12:52:24 +02:00
iwl-csr.h	iwlwifi: make hw rev checking more readable	2014-09-14 12:56:39 +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
iwl-drv.c	iwlwifi: always run the secured flow for family 8000	2014-10-29 12:52:24 +02:00
iwl-drv.h	iwlwifi: add Intel Mobile Communications copyright	2014-09-03 22:49:07 +03:00
iwl-eeprom-parse.c	iwlwifi: mvm: add LDPC support	2014-09-14 12:56:36 +03:00
iwl-eeprom-parse.h
iwl-eeprom-read.c
iwl-eeprom-read.h
iwl-fh.h
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: always run the secured flow for family 8000	2014-10-29 12:52:24 +02:00
iwl-io.c	iwlwifi: make hw rev checking more readable	2014-09-14 12:56:39 +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
iwl-notif-wait.h
iwl-nvm-parse.c	iwlwifi: mvm: add LDPC support	2014-09-14 12:56:36 +03:00
iwl-nvm-parse.h
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
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: mvm: port to devcoredump framework	2014-10-29 14:13:43 +02:00
Kconfig	iwlwifi: mvm: port to devcoredump framework	2014-10-29 14:13:43 +02:00
Makefile