Linux 4.0-rc3 Merging in v4.0-rc3 because commit 30a22c21 (console: Fix console name size mismatch) is a dependency.