Merge branch 'master'
[profile/ivi/kernel-adaptation-intel-automotive.git] / kernel / power / console.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2