greybus: Merge branch 'master' into driver_model_rework

diff --cc drivers/staging/greybus/connection.c
Simple merge

diff --cc drivers/staging/greybus/connection.h
index 17fde8fa285d48427b87a6c43587738ac457f012,4492d2f67ec4e49527866afad88eed0a0fceae3d..88a9398c79d674464b07f41409ba16fa411edbf2
--- 1/drivers/staging/greybus/connection.h
--- 2/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)

diff --cc drivers/staging/greybus/operation.c
Simple merge