merge mainline into usb

bus/usb/emu/usb.c

@@ -78,6 +78,12 @@ grub_libusb_devices (void)
   return GRUB_USB_ERR_NONE;
 }
 
+void
+grub_usb_poll_devices (void)
+{
+  /* TODO: recheck grub_usb_devs */
+}
+
 
 int
 grub_usb_iterate (int (*hook) (grub_usb_device_t dev))

bus/usb/ohci.c

@@ -459,7 +459,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
     grub_dma_free (o->hcca_chunk);
   grub_free (o);
 
-  return 1;
+  return 0;
 }