Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:22:01 +0000 (14:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:22:01 +0000 (14:22 -0500)

Trivial merge