Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:44:50 +0000 (14:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:44:50 +0000 (14:44 -0500)

Trivial merge