David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-10-20 06:08:27 -07:00

..

agn.h

iwlwifi: correctly size command string arrays

2015-08-23 09:36:02 +03:00

calib.c

iwlwifi: remove CMD_SYNC

2014-05-13 13:52:19 +03:00

calib.h

iwlwifi: Update Copyright to 2014

2013-12-31 19:03:53 +02:00

commands.h

iwlwifi: dvm: fix flush support for old firmware

2014-12-02 12:36:37 +02:00

debugfs.c

iwlwifi: convert hex_dump_to_buffer() to %*ph

2015-08-16 10:22:10 +03:00

dev.h

Merge tag 'mac80211-next-for-davem-2015-08-14' into next

2015-08-16 10:20:58 +03:00

devices.c

iwlwifi: remove CMD_SYNC

2014-05-13 13:52:19 +03:00

led.c

wireless: delete non-required instances of include <linux/init.h>

2014-01-03 15:37:01 -05:00

led.h

iwlwifi: make LED support optional

2014-05-06 20:40:05 +03:00

lib.c

iwlwifi: dvm: fix D3 firmware PN programming

2015-10-05 13:49:29 +03:00

mac80211.c

mac80211: allow to transmit A-MSDU within A-MPDU

2015-09-22 15:21:23 +02:00

main.c

iwlwifi: pass NAPI struct from transport layer

2015-08-16 10:21:21 +03:00

Makefile

iwlwifi: make LED support optional

2014-05-06 20:40:05 +03:00

power.c

iwlwifi: dvm: disable power save by default

2014-09-08 09:18:47 +03:00

power.h

iwlwifi: Update Copyright to 2014

2013-12-31 19:03:53 +02:00

rs.c

iwlwifi: make various functions void in the file rs.c

2015-08-04 21:29:35 +03:00

rs.h

iwlwifi: rs: use const u16 for throughput tables

2014-02-03 22:23:37 +02:00

rx.c

iwlwifi: correctly size command string arrays

2015-08-23 09:36:02 +03:00

rxon.c

iwlwifi: add wide firmware command support for notifications

2015-08-04 21:29:35 +03:00

scan.c

iwlwifi: dvm: remove command/return value from RX handlers

2015-08-04 10:11:41 +03:00

sta.c

iwlwifi: remove command header flags field

2015-08-04 10:11:44 +03:00

tt.c

iwlwifi: dvm: tt: Use setup_timer

2014-12-28 20:00:22 +02:00

tt.h

iwlwifi: Update Copyright to 2014

2013-12-31 19:03:53 +02:00

tx.c

iwlwifi: dvm: remove command/return value from RX handlers

2015-08-04 10:11:41 +03:00

ucode.c

iwlwifi: add wide firmware command support for notifications

2015-08-04 21:29:35 +03:00