Merge tag 'for-linville-20130318' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 20:34:55 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 20:34:55 +0000 (16:34 -0400)
commit345fb3f8efe5a4bf4f0e34e0a988b1482cbe9aa2
tree8760c705d23c9044c4daa5285a873749a10ae9f0
parent49c87cd1eac1f798c5bad7f7eb809e6df36b6c56
parent243c028099c467186d126859848bdac3bbfe8da0
Merge tag 'for-linville-20130318' of git://github.com/kvalo/ath6kl
drivers/net/wireless/ath/ath6kl/Kconfig
drivers/net/wireless/ath/ath6kl/cfg80211.c