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

This commit is contained in:
John W. Linville 2013-08-09 15:08:10 -04:00
commit fa5978447c
19 changed files with 772 additions and 34 deletions