Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / tty / serial / m32r_sio.c

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