Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:41:57 +0000 (14:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:41:57 +0000 (14:41 -0400)

Trivial merge