Merge branch 'next' into for-linus

[pandora-kernel.git] / drivers / tty / sysrq.c

diff --git a/drivers/char/sysrq.c b/drivers/tty/sysrq.c
similarity index 100%
rename from drivers/char/sysrq.c
rename to drivers/tty/sysrq.c