Merge branch 'x86/alternatives' into x86/core
[linux-2.6] / drivers / scsi / 53c700_d.h_shipped
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2