leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
818f2e7b25
linux/drivers/net/wireless/iwlwifi
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
dvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
iwl-1000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-2000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-5000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-6000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-03-12 09:57:21 +02:00
iwl-7000.c iwlwifi: bump API to 13 for devices that use iwlmvm 2015-03-12 09:57:32 +02:00
iwl-8000.c iwlwifi: bump API to 13 for devices that use iwlmvm 2015-03-12 09:57:32 +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: allow to define the stuck queue timer per queue 2015-02-01 15:57:23 +02:00
iwl-csr.h iwlwifi: mvm: support family 8000 C step 2015-01-22 17:55:20 +02: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 MCC update FW API 2015-03-12 09:57:21 +02:00
iwl-devtrace.c iwlwifi: don't export tracepoints unnecessarily 2014-09-03 22:49:03 +03:00
iwl-devtrace.h iwlwifi: mvm: new Alive / error table API 2015-03-01 16:55:12 +02:00
iwl-drv.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
iwl-drv.h iwlwifi: update copyright to include 2015 2015-03-12 09:57:46 +02:00
iwl-eeprom-parse.c iwlwifi: change max HT and VHT A-MPDU exponent 2014-11-23 19:57:30 +02:00
iwl-eeprom-parse.h iwlwifi: iwlmvm: LAR: disable LAR support due to NVM vs TLV conflict 2015-03-12 09:57:27 +02:00
iwl-eeprom-read.c
iwl-eeprom-read.h
iwl-fh.h iwlwifi: pcie: limit fw chunk sizes given to fh 2014-12-14 10:20:30 +02:00
iwl-fw-error-dump.h iwlwifi: mvm: add trigger for firmware dump upon low RSSI 2015-03-02 08:20:32 +02:00
iwl-fw-file.h iwlwifi: mvm: BT Coex - disable RRC by default 2015-03-12 09:57:33 +02:00
iwl-fw.h iwlwifi: mvm: add framework for triggers for fw dump 2015-03-02 08:20:28 +02:00
iwl-io.c iwlwifi: mvm: fix force NMI for 8000 2015-03-12 09:57:45 +02:00
iwl-io.h iwlwifi: update nmi register 2014-05-15 19:50:51 +03:00
iwl-modparams.h iwlwifi: allow disabling LAR via module param 2015-03-12 09:57:29 +02:00
iwl-notif-wait.c
iwl-notif-wait.h
iwl-nvm-parse.c iwlwifi: don't allow the FW to return invalid ch indices 2015-03-12 09:57:39 +02:00
iwl-nvm-parse.h iwlwifi: mvm: take the MAC address from HW registers 2015-03-12 09:57:30 +02:00
iwl-op-mode.h iwlwifi: mvm/trans: abort d0i3_enter in case of held ref 2014-11-11 17:15:04 +02:00
iwl-phy-db.c iwlwifi: mvm: increase the number of PAPD channel groups to 9 2015-03-01 16:55:05 +02:00
iwl-phy-db.h
iwl-prph.h iwlwifi: trans: Take ownership on secure machine before FW load 2015-03-12 09:57:41 +02:00
iwl-scd.h iwlwifi: pcie: prepare the enablement of 31 TFD queues 2015-02-01 15:57:20 +02:00
iwl-trans.h iwlwifi: pcie: allow the op_mode to freeze the stuck queue timer 2015-03-12 09:57:43 +02:00
Kconfig iwlwfifi: fix WANT_DEV_COREDUMP selection in Kconfig 2014-10-31 13:10:32 +02:00
Makefile