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

Trivial merge