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

All merge conflicts were simple overlapping changes.

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

2017-02-02 16:54:00 -05:00

..

ipw2x00

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

iwlegacy

Merge tag 'wireless-drivers-next-for-davem-2017-01-02' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2017-01-02 15:23:34 -05:00

iwlwifi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-02-02 16:54:00 -05:00

Kconfig

iwlwifi: move under intel vendor directory

2015-11-18 14:28:30 +02:00

Makefile

iwlwifi: move under intel vendor directory

2015-11-18 14:28:30 +02:00