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

This commit is contained in:
John W. Linville 2013-08-09 13:49:10 -04:00
commit 4fec06a364
5 changed files with 32 additions and 26 deletions