Merge branch 's3c-move' into devel
[linux-2.6] / include / linux / cd1400.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2