Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
commit4fe0c75eedb15af13859ef123db17fefed5af7ae
tree6ed38d8e2e0ae457d10a2af2e496e9ecb4d34e08
parent8457703f1e86aaf0f134402dd1e09e1f13e65222
parent9c35d7d2368f54313b988a01c408e5cf863ffd9e
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/ath/ath6kl/cfg80211.c