Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:01:24 +0000 (15:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:01:24 +0000 (15:01 -0400)

Trivial merge