Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Feb 2014 18:42:02 +0000 (13:42 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Feb 2014 18:42:02 +0000 (13:42 -0500)

Trivial merge