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-01-16 12:54:17 -05:00
commit 2b755bbd81
18 changed files with 94 additions and 63 deletions