Merge by hand (whitespace conflicts in libata.h)
[powerpc.git] / arch / cris / kernel / sys_cris.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2