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)
commit1e5023c7cc11158f74a637aa92897da954572a25
treea0b2234b331abf9b2c80dbce20a018d537e541a6
parentdfbebe14428803402293d9a8bf1efef7221d8b78
parentff7e68670c49b6404acc4fce6ca90d6c89ef0efe
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/hif.c