author | John W. Linville <linville@tuxdriver.com> | |
Mon, 2 Dec 2013 19:25:38 +0000 (14:25 -0500) | ||
committer | John W. Linville <linville@tuxdriver.com> | |
Mon, 2 Dec 2013 19:25:38 +0000 (14:25 -0500) |
diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge
diff --cc drivers/net/wireless/ath/regd.c
Simple merge
Simple merge
Simple merge
diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge
diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge
diff --cc net/mac80211/rate.h
Simple merge
diff --cc net/mac80211/trace.h
Simple merge
diff --cc net/wireless/core.h
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge