Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / drivers / tty / vt / keyboard.c
Simple merge