Merge branch 'master' into for-next

2014-02-20 14:54:28 +01:00
parent be873ac782 6d0abeca32
commit d4263348f7
10316 changed files with 557568 additions and 217526 deletions
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -468,6 +468,8 @@ struct usb_function_instance {
 	struct config_group group;
 	struct list_head cfs_list;
 	struct usb_function_driver *fd;
+	int (*set_inst_name)(struct usb_function_instance *inst,
+			      const char *name);
 	void (*free_func_inst)(struct usb_function_instance *inst);
 };