Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[platform/kernel/linux-starfive.git] / drivers / md / raid6sse1.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2