Merge branch 'master' into memdisk-cd

diff --cc memdisk/Makefile
index 54b08ba,93575c3..d9c1620
--- 1/memdisk/Makefile
--- 2/memdisk/Makefile
+++ b/memdisk/Makefile
@@@ -110,11 -107,17 +110,14 @@@ memdisk: memdisk16.bin memdisk32.bin po
  e820test: e820test.c e820func.c msetup.c
        $(CC) -m32 -g -W -Wall -DTEST -o $@ $^
  
 -memdisk.o: memdisk.bin
 -      $(LD) -r -b binary -o $@ $<
 -
  .depend:
        rm -f .depend
-       for csrc in *.c ; do $(CC) $(INCLUDE) $(CFLAGS) -MM $$csrc >> .depend ; done
-       for ssrc in *.S ; do $(CC) $(INCLUDE) $(SFLAGS) -MM $$ssrc >> .depend ; done
-       for nsrc in $(NASMSRC) ; do $(NASM) -DDEPEND $(NINCLUDE) -o `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc >> .depend ; done
+       for csrc in *.c ; do $(CC) $(INCLUDE) $(CFLAGS) -MM $$csrc >> .depend ; done ; true
+       for ssrc in *.S ; do $(CC) $(INCLUDE) $(SFLAGS) -MM $$ssrc >> .depend ; done ; true
+       for nsrc in $(NASMSRC) ; do \
+               ( $(NASM) -DDEPEND $(NINCLUDE) -o \
+                 `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc ; \
+                 echo '' ) >> .depend ; done ; true
  
  depend:
        rm -f .depend

diff --cc memdisk/setup.c
Simple merge