Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 19:37:34 +0000 (15:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 19:37:34 +0000 (15:37 -0400)

Trivial merge