]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
commit577e9688e01e770e862bd7e65aad0e15fafe36a8
treed94706b87fcad04d08a46a9b3555396d21ab41ec
parent080d33b851130135214900ae2008e5e6ea846ba4
parent8ade489e6468d3d1aaf093059592732a71bf2aed
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/ath/ath5k/mac80211-ops.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/mac80211_hwsim.c
net/mac80211/mesh.c
net/mac80211/mesh.h
net/mac80211/mesh_plink.c