Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Apr 2013 12:37:39 +0000 (08:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Apr 2013 12:37:39 +0000 (08:37 -0400)

Trivial merge