Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 16:49:22 +0000 (12:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 16:49:22 +0000 (12:49 -0400)

Trivial merge