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 2014-01-03 15:25:15 -05:00
commit 55d1cad2ef
28 changed files with 687 additions and 90 deletions