Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:21:07 +0000 (15:21 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:21:07 +0000 (15:21 -0500)

Trivial merge