David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
dvm	iwlwifi: fix the reclaimed packet tracking upon flush queue	2013-01-03 15:31:15 +01:00
pcie	iwlwifi: fix PCIe interrupt handle return value	2013-01-03 15:29:15 +01:00
iwl-agn-hw.h
iwl-config.h	iwlwifi: Change define and struct names in iwl-eeprom-parse.h	2012-12-06 22:21:38 +01:00
iwl-csr.h	iwlwifi: configure the SKU in the HW	2012-06-06 13:22:30 +02:00
iwl-debug.c	iwlwifi: fix debug message level	2012-06-29 14:28:59 +02:00
iwl-debug.h	iwlwifi: refactor EEPROM reading/parsing	2012-06-06 13:24:19 +02:00
iwl-devtrace.c
iwl-devtrace.h	iwlwifi: move prph handling into the transport	2012-12-06 22:24:03 +01:00
iwl-drv.c	iwlwifi: return real info in probe failure	2012-11-29 16:04:27 +01:00
iwl-drv.h	iwlwifi: s/iwl_ucode_callback/iwl_req_fw_callback	2012-07-26 08:53:22 +02:00
iwl-eeprom-parse.c	iwlwifi: Change define and struct names in iwl-eeprom-parse.h	2012-12-06 22:21:38 +01:00
iwl-eeprom-parse.h	iwlwifi: Change define and struct names in iwl-eeprom-parse.h	2012-12-06 22:21:38 +01:00
iwl-eeprom-read.c	iwlwifi: refactor EEPROM reading/parsing	2012-06-06 13:24:19 +02:00
iwl-eeprom-read.h	iwlwifi: refactor EEPROM reading/parsing	2012-06-06 13:24:19 +02:00
iwl-fh.h	iwlwifi: update the RB_TIMEOUT to 0x11	2012-11-19 15:07:48 +01:00
iwl-fw-file.h
iwl-fw.h	net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings	2013-01-06 21:06:31 -08:00
iwl-io.c	iwlwifi: move prph handling into the transport	2012-12-06 22:24:03 +01:00
iwl-io.h	iwlwifi: move prph handling into the transport	2012-12-06 22:24:03 +01:00
iwl-modparams.h
iwl-notif-wait.c	iwlwifi: don't disable interrupt in iwl_abort_notification_waits	2012-06-18 10:46:37 +02:00
iwl-notif-wait.h
iwl-op-mode.h	iwlwifi: rework the iwlwifi debugfs structure	2012-07-26 08:59:28 +02:00
iwl-prph.h	iwlwifi: wipe out the status of the SCD when we disable a queue	2012-10-16 16:31:53 +02:00
iwl-test.c	iwlwifi: iwl_{read,write}_targ_mem_words takes dwords	2012-06-13 09:01:01 +02:00
iwl-test.h	iwlwifi: decouple testmode and iwl-test	2012-06-11 11:41:18 +02:00
iwl-testmode.h	iwlwifi: refactor testmode	2012-06-11 11:37:21 +02:00
iwl-trans.h	iwlwifi: move prph handling into the transport	2012-12-06 22:24:03 +01:00
Kconfig	iwlwifi: remove MFP Kconfig option	2012-10-23 15:27:25 +02:00
Makefile	iwlwifi: Fix Makefile build order for built-in driver	2012-06-13 09:01:05 +02:00