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-08-16 14:48:40 -04:00
commit 24de851b79
20 changed files with 809 additions and 713 deletions