Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
commitaa3c90b89045b532418feb3eca6ca258920bf702
treee7b044fc01740983d342238dc6f927170f41c978
parent660b9caaad380758c756a7e60397e33dab44fe3f
parent1c3fea82d6ebf33edadefed2d9ce3efa1a654338
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c