Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 19:12:41 +0000 (15:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 19:12:41 +0000 (15:12 -0400)

Trivial merge