Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 17:49:21 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 17:49:21 +0000 (13:49 -0400)

Trivial merge