Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Feb 2014 19:56:22 +0000 (14:56 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Feb 2014 19:56:22 +0000 (14:56 -0500)

Trivial merge