From: Greg Kroah-Hartman <greg@kroah.com>
Date: Tue, 28 Oct 2014 02:30:18 +0000 (+0800)
Subject: greybus: Merge branch 'master' into driver_model_rework
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a25f375cf7f78f58aa462a9957d39328921583b5;p=openwrt%2Fstaging%2Fblogic.git

greybus: Merge branch 'master' into driver_model_rework
---

a25f375cf7f78f58aa462a9957d39328921583b5
diff --cc drivers/staging/greybus/connection.h
index 17fde8fa285d,4492d2f67ec4..88a9398c79d6
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@@ -36,7 -45,10 +45,9 @@@ struct gb_connection 
  	struct list_head		operations;
  	struct rb_root			pending;	/* awaiting reponse */
  	atomic_t			op_cycle;
 -	struct delayed_work		timeout_work;
  
+ 	struct gb_connection_handler	*handler;
+ 
  	void				*private;
  };
  #define to_gb_connection(d) container_of(d, struct gb_connection, dev)