1
0
Fork 0
alistair23-linux/drivers/net/wireless/intel
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
ipw2x00 ipw2x00: track time using boottime 2018-06-27 19:10:25 +03:00
iwlegacy treewide: kzalloc() -> kcalloc() 2018-06-12 16:19:22 -07:00
iwlwifi Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-08-02 10:55:32 -07:00
Kconfig net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text 2018-03-13 18:52:25 +02:00
Makefile