Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:40:26 +0000 (14:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:40:26 +0000 (14:40 -0400)

Trivial merge