Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Jul 2014 17:06:17 +0000 (13:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Jul 2014 17:06:17 +0000 (13:06 -0400)

Trivial merge