[IA64] Manual merge fix for 3 files
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / sh64 / kernel / module.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2