Merge branch 'master' into tk71

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

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