2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 03:24:03 +08:00
linux-next/drivers/net/wireless/intel
David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 00:52:29 -04:00
..
ipw2x00 cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwlegacy cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
Kconfig
Makefile