Merge branch 'for-john' of git://x-git.kernel.org/pub/scm/linux/kernel/git/jberg...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 12 Apr 2013 17:20:51 +0000 (13:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 12 Apr 2013 17:20:51 +0000 (13:20 -0400)

Trivial merge