Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 18:01:43 +0000 (14:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 18:01:43 +0000 (14:01 -0400)

Trivial merge