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

Trivial merge