Merge 'upstream-2.6.13' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git] / lib /
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)