Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 20:33:16 +0000 (15:33 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 20:33:16 +0000 (15:33 -0500)

Trivial merge