Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Aug 2011 18:27:52 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Aug 2011 18:27:52 +0000 (14:27 -0400)

Trivial merge