]> 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>
Wed, 12 Jun 2013 19:39:05 +0000 (15:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 19:39:05 +0000 (15:39 -0400)
commit7c4d71b9ef1dd6f1b54898cf46d322792061fec6
treeb68ee223f22a811e9743b193872052cd264fe2d0
parent8b5d318750a38bd76d4df3a8edf8dbbb896e530b
parenta0109114e5439316a43b06d6982908750a7d4d6e
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/cw1200/main.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h