Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:28:35 +0000 (11:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:28:35 +0000 (11:28 -0400)

Trivial merge