]> 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, 30 Apr 2014 16:04:27 +0000 (12:04 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Apr 2014 16:04:27 +0000 (12:04 -0400)
commitb33cc9150ae95cd23cf1d2317bd543f19db2b782
treee8e06d7c2057c69e19848ee3abd6720927f5f9f9
parent22671bc9fef1806faf7ad5461c835c330f868978
parent5916f7fa45172a384a441226e5acf7d58262086c
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
net/mac80211/chan.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
net/mac80211/chan.c
net/mac80211/main.c