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-09-24 14:37:36 -04:00
commit e5a876250d
7 changed files with 117 additions and 90 deletions