Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 20:02:18 +0000 (15:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 20:02:18 +0000 (15:02 -0500)

Trivial merge