tree 6cd273487574edd2da40ce14b1981e14a5171caa
parent 474a41e94dfc85167e1761bfbb8bf180f90633b2
parent 73fb08e24ae840bc518facc2c605dd6bb3751fec
author John W. Linville <linville@tuxdriver.com> 1395330800 -0400
committer John W. Linville <linville@tuxdriver.com> 1395330800 -0400

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