Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
commit9e97d14b4923da524d202f2e005d5d30b70db9d6
treed77b0c7f1f8890fb75098c550277fe9b81c340b3
parentded652a67464b1fa66616954bc608ead9ec02fb6
parent6f7c1adb7529935df6e288a1436003c1f6dc0653
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/wmi.c