Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2014 19:15:14 +0000 (15:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2014 19:26:36 +0000 (15:26 -0400)
commit855df36de365fb3b49eb06c352015e3d215b43fe
tree2a76f128eb457e1bacb585260b3e03f72b03cc1e
parentd6067f0e17eb1de7d9b1d792f67d17c6e894b770
parent97dc94f1d933c9df2c0b327066ea130c0e92083f
Merge git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/mwifiex/cfg80211.c