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-07 14:57:43 -05:00
commit 48c6cc04c9
17 changed files with 311 additions and 386 deletions