Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Mar 2014 20:55:28 +0000 (16:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Mar 2014 20:55:28 +0000 (16:55 -0400)

Trivial merge