Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:36:40 +0000 (11:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:36:40 +0000 (11:36 -0400)

Trivial merge