Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / tty / serial / zs.h

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