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)
commitf6595444c1ee798f9c227107bb3ab14730c6497a
treee8e06d7c2057c69e19848ee3abd6720927f5f9f9
parent0006433a5be9e0e155ad493e33c6e9bf3868a87f
parentf55ee0834247c88cb6981cb11eb1870392878371
Merge branch 'for-john' of git://git./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