Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jun 2013 00:00:11 +0000 (20:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jun 2013 00:00:11 +0000 (20:00 -0400)

Trivial merge