Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:15:35 +0000 (16:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:15:35 +0000 (16:15 -0400)

Trivial merge