Merge branch 'ath-current' into ath-next

Browse source

Commit 3c97f5de1f ("ath10k: implement NAPI support") conflicts with
ath-current. To avoid any merge problems merge ath-current to ath-next already now.

Conflicts:
	drivers/net/wireless/ath/ath10k/htt_rx.c

...

This commit is contained in:

Kalle Valo 2016-09-09 15:19:40 +03:00

parent 78a9e17038 e34f2ff40e

commit 3cd32dde17

5 changed files with 21 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/wireless/ath/ath10k/htt_rx.c

View file

1

drivers/net/wireless/ath/ath10k/pci.c

View file

4

drivers/net/wireless/ath/ath9k/hw.c

View file

18

drivers/net/wireless/ath/ath9k/main.c

View file

3

drivers/net/wireless/marvell/mwifiex/11n_aggr.c

View file