Merge branch 'chromeos-misc-3.4' into chromeos-3.4
[cascardo/linux.git] / .scmversion