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)
1  2 
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/mwifiex/cfg80211.c

Simple merge