git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 251c9ba a59b40b)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 6 Dec 2013 14:50:45 +0000 (09:50 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 6 Dec 2013 14:50:45 +0000 (09:50 -0500)
commit	e08fd975bf26aa8063cadd245817e042f570472d
tree	2b2a705710e6374cc037f89bcc7bfc25047485ba	tree \| snapshot
parent	251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f	commit \| diff
parent	a59b40b30f3f51bf5c56c15a7dc4da11b424a34b	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c

19 files changed:

drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wcn36xx/smd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_minstrel_ht.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/ibss.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree