Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Jul 2013 20:02:10 +0000 (16:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Jul 2013 20:02:10 +0000 (16:02 -0400)

Trivial merge