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 2013-06-10 14:51:17 -04:00
commit 76015021aa
20 changed files with 371 additions and 66 deletions