]> 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>
Thu, 12 Jul 2012 19:21:05 +0000 (15:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:05 +0000 (15:21 -0400)
commit00344586284a68cc9b30cfadfd737a9ad1e688e2
tree0f140aa244ddc2c52494155342298cef64fc8456
parenta0cb90cd5a7f2cfae052beaea5e965546e8dbb3d
parent9889eed56224d55c60a870565286946a8dd39099
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/main.h
net/mac80211/mlme.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c