Merge by hand (conflicts in sd.c)
[linux-2.6] / drivers / fc4 / fc-al.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2