Trivial Makefile merge

diff --cc drivers/usb/core/usb.c
index 138541225604495db92108ebe673d7cdef30dfaa,2932c62b371fb200494e419ee1ea1719d34763ec..ca0b29d0ac1fcffbfbc9543510c259d017a940d0
--- 1/drivers/usb/core/usb.c
--- 2/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@@ -151,9 -159,10 +160,11 @@@ int usb_register(struct usb_driver *new
        new_driver->driver.bus = &usb_bus_type;
        new_driver->driver.probe = usb_probe_interface;
        new_driver->driver.remove = usb_unbind_interface;
 +      new_driver->driver.owner = new_driver->owner;
  
+       usb_lock_all_devices();
        retval = driver_register(&new_driver->driver);
+       usb_unlock_all_devices();
  
        if (!retval) {
                pr_info("%s: registered new driver %s\n",

diff --cc include/linux/module.h
Simple merge

diff --cc kernel/Makefile
Simple merge