Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Oct 2013 17:25:18 +0000 (13:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Oct 2013 17:25:18 +0000 (13:25 -0400)

Trivial merge