Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 17:57:23 +0000 (12:57 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 17:57:23 +0000 (12:57 -0500)

Trivial merge