Merge branch 'master' into lua

Resolved Conflicts:
	com32/Makefile

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc com32/Makefile
index 5d1ff44,4f95017..b090c40
--- 1/com32/Makefile
--- 2/com32/Makefile
+++ b/com32/Makefile
@@@ -1,4 -1,4 +1,5 @@@
- SUBDIRS = lib libutil modules menu samples lua/src
+ SUBDIRS = tools lib gpllib libutil modules mboot menu samples rosh cmenu \
 -        hdt gfxboot sysdump
++        hdt gfxboot sysdump lua/src
 +
  all tidy dist clean spotless install:
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done