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

..

ar5523

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

ath5k

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

ath6kl

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

ath9k

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

2016-05-04 00:52:29 -04:00

ath10k

Merge ath-next from ath.git

2016-04-26 14:13:59 +03:00

carl9170

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

wcn36xx

Merge ath-next from ath.git

2016-04-26 14:13:59 +03:00

wil6210

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

ath.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

debug.c

ath: Make ath_opmode_to_string understand OCB mode

2015-08-10 22:21:15 +03:00

dfs_pattern_detector.c

ath: fix DFS timestamp wraparound reset condition

2015-10-09 11:47:31 +03:00

dfs_pattern_detector.h

ath: use PRI value given by spec for fixed PRI

2015-09-27 15:50:30 +03:00

dfs_pri_detector.c

ath: use PRI value given by spec for fixed PRI

2015-09-27 15:50:30 +03:00

dfs_pri_detector.h

…

hw.c

…

Kconfig

ath: unify Kconfig with other vendors

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

key.c

…

main.c

…

Makefile

…

reg.h

…

regd_common.h

…

regd.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

regd.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

spectral_common.h

…

trace.c

…

trace.h

…