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 2013-01-22 15:39:51 -05:00
commit aa3c90b890
8 changed files with 212 additions and 68 deletions