parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046
author John W. Linville <linville@tuxdriver.com> 1156272156 -0400
committer John W. Linville <linville@tuxdriver.com> 1156272156 -0400

Merge branch 'from-linus' into upstream
~