Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Aug 2011 17:51:19 +0000 (13:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Aug 2011 17:51:19 +0000 (13:51 -0400)

Trivial merge