Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:23:00 +0000 (16:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:23:00 +0000 (16:23 -0500)

Trivial merge