Merge branch 'for-3.12/upstream' into for-next

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index f53f2d52e677b4f80b1bd454e673f2ec0a7ce816..5bf2fb785844919bbc27ad20160b98a998102aa5 100644 (file)
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -634,3 +634,4 @@ module_exit(uhid_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>");
 MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem");
+MODULE_ALIAS("devname:" UHID_NAME);