Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 25 Sep 2012 19:55:02 +0000 (15:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 25 Sep 2012 19:55:02 +0000 (15:55 -0400)

Trivial merge