Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)

Trivial merge