Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:58:13 +0000 (13:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:58:13 +0000 (13:58 -0400)

Trivial merge