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-16 14:24:51 -04:00
commit d074666366
28 changed files with 707 additions and 372 deletions