[IA64] Manual merge fix for 3 files
[powerpc.git] / include / asm-arm / arch-s3c2410 / iic.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2