merge by hand (fix up qla_os.c merge error)
[linux-2.6] / arch / m32r / boot /
drwxr-xr-x   ..
-rw-r--r-- 442 Makefile
drwxr-xr-x - compressed
-rw-r--r-- 3702 setup.S