Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 19:41:35 +0000 (14:41 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 19:41:35 +0000 (14:41 -0500)

Trivial merge