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

This commit is contained in:
John W. Linville 2014-07-23 13:06:17 -04:00
commit d878b3af67
21 changed files with 966 additions and 395 deletions