Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:00:29 +0000 (14:00 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:00:29 +0000 (14:00 -0500)

Trivial merge