tree 3eed3a2582532bd1fd890b58eadd472fcd2b1dc7
parent 7a5f799becc51c842ec1a3aeb8dd82651aea7036
parent 9385d04f2872057a2029901190391fe192b18693
author John W. Linville <linville@tuxdriver.com> 1348511680 -0400
committer John W. Linville <linville@tuxdriver.com> 1348511680 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next