Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:33:58 +0000 (13:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:33:58 +0000 (13:33 -0400)

Trivial merge