Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 19:08:14 +0000 (14:08 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 19:08:14 +0000 (14:08 -0500)
1  2 
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/hif.c

Simple merge