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 2012-06-20 14:40:26 -04:00
commit 324640e359
11 changed files with 93 additions and 85 deletions