]> 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)
commit07bd21a00c3c5f910b39617ff4e1eac05ae08917
treed94706b87fcad04d08a46a9b3555396d21ab41ec
parentaa9ec28c4644b9a4a0257b6d84f3ff4ae399726d
parentb4090722857fcae0547b4fce17749b72656fd49c
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