merge mainline into ehci

diff --cc grub-core/Makefile.core.def
index 346ec24ee70065b5ed6963e56c2c6818fe1a3d67,02389a163a3664fe7e98164f64b9216782bb2d7a..80054b3daef6b8378df625e2488262c0061c48ee
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -437,19 -462,10 +462,16 @@@ module = 
    enable = pci;
  };
  
 +module = {
 +  name = ehci;
 +  common = bus/usb/ehci.c;
 +  enable = pci;
 +};
 +
  module = {
    name = pci;
-   noemu = bus/pci.c;
-   emu = bus/emu/pci.c;
-   emu = commands/lspci.c;
+   common = bus/pci.c;
  
-   enable = emu;
    enable = i386_pc;
    enable = i386_efi;
    enable = x86_64_efi;

diff --cc grub-core/bus/usb/usbhub.c
Simple merge

diff --cc include/grub/usb.h
Simple merge