Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Feb 2014 20:14:34 +0000 (15:14 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Feb 2014 20:14:34 +0000 (15:14 -0500)

Trivial merge