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

author	John W. Linville <linville@tuxdriver.com>
	Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
commit	01e17dacd47101ad7d33152bbfbbd4394352d2e6
tree	d94706b87fcad04d08a46a9b3555396d21ab41ec	tree \| snapshot
parent	22c5649eef0fc37532e20c14d2656b28ca708a69	commit \| diff
parent	dcf33963c48e1959c83fda84e336dbb000eefa3f	commit \| diff

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/mac80211_hwsim.c

John Crispins staging tree

drivers/net/wireless/ath/ath5k/mac80211-ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43legacy/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_plink.c	diff1 \|	diff2 \|	blob \| history