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

Trivial merge