Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
commit066433a6fa9249db2117adcda330a34ae99814b7
tree1ccf31cc8c9ac494d6371073ddead320c927a4d6
parentaa3c90b89045b532418feb3eca6ca258920bf702
parent5a32aff37a02ebc959837f08d09ac8ba65d4f1b0
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/mwifiex/cfg80211.c