merge Linus head tree into my drm tree and fix up conflicts
[powerpc.git] / drivers / char / riscom8.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2