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-07-12 15:21:48 -04:00
commit 8a50ace271
8 changed files with 20 additions and 40 deletions