tree 48c18144f3e5e530ec61d5eadbb5a34675a69fe8
parent 559c33d84da71e07816e692bfd73ad92675256a6
parent 26b0e411d37a2ca5992d02884dc3fa4e1907e598
author John W. Linville <linville@tuxdriver.com> 1389642059 -0500
committer John W. Linville <linville@tuxdriver.com> 1389642059 -0500

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