Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:20:07 +0000 (14:20 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:20:07 +0000 (14:20 -0500)

Trivial merge