merge by hand (fix up qla_os.c merge error)
[linux-2.6] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1119 Makefile.rules