Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Jul 2014 18:59:57 +0000 (14:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Jul 2014 18:59:57 +0000 (14:59 -0400)

Trivial merge