Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / tty / tty_ioctl.c

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