merge with mainline

diff --cc conf/Makefile.common
Simple merge

diff --cc conf/Makefile.extra-dist
index 9acaadbcc1ace95d0a57b2a638eec567775630c1,afedc7d281c399a1200fec6365dca20a472d47fc..68989d33324f4c068c1ceb93d61a7e28cfee5595
--- 1/conf/Makefile.extra-dist
--- 2/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@@ -14,13 -19,20 +19,14 @@@ EXTRA_DIST += grub-core/Makefile.core.d
  EXTRA_DIST += grub-core/Makefile.gcry.def
  
  EXTRA_DIST += grub-core/genmoddep.awk
 -EXTRA_DIST += grub-core/genmodsrc.sh
 -EXTRA_DIST += grub-core/genfslist.sh
 -EXTRA_DIST += grub-core/gencmdlist.sh
 +EXTRA_DIST += grub-core/genmod.sh.in
 +EXTRA_DIST += grub-core/gensyminfo.sh.in
  EXTRA_DIST += grub-core/gensymlist.sh
  EXTRA_DIST += grub-core/genemuinit.sh
 -EXTRA_DIST += grub-core/genvideolist.sh
 -EXTRA_DIST += grub-core/genhandlerlist.sh
 -EXTRA_DIST += grub-core/genpartmaplist.sh
 -EXTRA_DIST += grub-core/genterminallist.sh
 -EXTRA_DIST += grub-core/genparttoollist.sh
  EXTRA_DIST += grub-core/genemuinitheader.sh
  
+ EXTRA_DIST += grub-core/lib/libgcrypt/cipher
  EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 +EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
  EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
  EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
 -EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')

diff --cc gentpl.py
Simple merge

diff --cc grub-core/Makefile.am
index 3ee526ff8d5fbe264a4f6f045644a232708a02dd,566a0cb0ad6f065668988690b9c9c5a69d83ff46..0c47d78a5acf8fc5ca6edbc4ba445c31b62f3f58
--- 1/grub-core/Makefile.am
--- 2/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@@ -321,28 -247,14 +264,27 @@@ CLEANFILES += video.ls
  # but, crypto.lst is simply copied
  crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
        cp $^ $@
 +platform_DATA += crypto.lst
  CLEANFILES += crypto.lst
  
 +syminfo.lst: gensyminfo.sh kernel_syms.lst $(MODULE_FILES)
 +      cat kernel_syms.lst > $@.new
 +      for m in $(MODULE_FILES); do \
 +        sh $< $$m >> $@.new || exit 1; \
 +      done
 +      mv $@.new $@
 +
  # generate global module dependencies list
 -moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
 -      cat $(DEF_FILES) kernel_syms.lst /dev/null \
 -        | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \
 -        || (rm -f $@; exit 1)
 +moddep.lst: syminfo.lst genmoddep.awk
 +      cat $< | sort | awk -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
 +platform_DATA += moddep.lst
 +CLEANFILES += config.log syminfo.lst moddep.lst
 +
 +$(MOD_FILES): %.mod : genmod.sh moddep.lst %.module$(EXEEXT)
 +      sh $^ $@
 +platform_DATA += $(MOD_FILES)
 +CLEANFILES += $(MOD_FILES)
  
- if COND_i386_pc
  if COND_ENABLE_EFIEMU
  efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
        -rm -f $@; \

diff --cc grub-core/Makefile.core.def
index c852c344f8156238e0e26b04c5b87410ccc3110e,b9abac40d0f9b45a46feb9b68dd89e0794b1fb9a..d8ab2935ff2b03bdfa779db470e61b885af91abf
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1,5 -1,5 +1,15 @@@
  AutoGen definitions Makefile.tpl;
  
++script = {
++  name = gensyminfo.sh;
++  common = gensyminfo.sh.in;
++};
++
++script = {
++  name = genmod.sh;
++  common = genmod.sh.in;
++};
++
  kernel = {
    name = kernel;
  

diff --cc grub-core/bus/usb/uhci.c
index 0bba24b54b6251c45398174cc5835c1bcbce67f5,2265ebed0629454821fc9f17e549000b3e795b7d..4bf84a8f8472687e873a7ed181ed45f933f9a5e9
--- 1/grub-core/bus/usb/uhci.c
--- 2/grub-core/bus/usb/uhci.c
+++ b/grub-core/bus/usb/uhci.c
@@@ -39,7 -41,22 +41,20 @@@ typedef enu
  #define GRUB_UHCI_LINK_TERMINATE      1
  #define GRUB_UHCI_LINK_QUEUE_HEAD     2
  
+ enum
+   {
+     GRUB_UHCI_REG_PORTSC_CONNECT_CHANGED = 0x0002,
+     GRUB_UHCI_REG_PORTSC_PORT_ENABLED    = 0x0004,
+     GRUB_UHCI_REG_PORTSC_RESUME          = 0x0040,
+     GRUB_UHCI_REG_PORTSC_RESET           = 0x0200,
+     GRUB_UHCI_REG_PORTSC_SUSPEND         = 0x1000,
+     GRUB_UHCI_REG_PORTSC_RW = GRUB_UHCI_REG_PORTSC_PORT_ENABLED
+     | GRUB_UHCI_REG_PORTSC_RESUME | GRUB_UHCI_REG_PORTSC_RESET
+     | GRUB_UHCI_REG_PORTSC_SUSPEND,
+     /* These bits should not be written as 1 unless we really need it */
+     GRUB_UHCI_PORTSC_RWC = ((1 << 1) | (1 << 3) | (1 << 11) | (3 << 13))
+   };
  
 -#define 
 -
  /* UHCI Queue Head.  */
  struct grub_uhci_qh
  {

diff --cc util/bash-completion.d/Makefile.am
index 0000000000000000000000000000000000000000,58171988d43e676f93d945b08dba04e5c10ddcd6..136287cf1bfe21ac1fd10a136ed2c96a54c56295
mode 000000,100644..100644
--- /dev/null
--- 2/util/bash-completion.d/Makefile.am
+++ b/util/bash-completion.d/Makefile.am
@@@ -1,0 -1,13 +1,13 @@@
 -CLEANFILES = $(bash_completion_script)
+ 
+ bash_completion_source = grub-completion.bash.in
+ bash_completion_script = grub
+ 
+ EXTRA_DIST = $(bash_completion_source)
+ 
++CLEANFILES = $(bash_completion_script) config.log
+ 
+ bashcompletiondir = $(sysconfdir)/bash_completion.d
+ bashcompletion_DATA = $(bash_completion_script)
+ 
+ $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
+       $(top_builddir)/config.status --file=$@:$<