Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Sep 2014 18:37:07 +0000 (14:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Sep 2014 18:37:07 +0000 (14:37 -0400)

Trivial merge