diff --git a/[refs] b/[refs]
index 3c1e99746981..347f715f7b38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 292cb18a802c21434206b578d12b05793950cad9
+refs/heads/master: 106fb49f72602470bae3c83d1899156768219aa2
diff --git a/trunk/drivers/staging/mei/mei_dev.h b/trunk/drivers/staging/mei/mei_dev.h
index 6f3ec068ed69..30590803fec5 100644
--- a/trunk/drivers/staging/mei/mei_dev.h
+++ b/trunk/drivers/staging/mei/mei_dev.h
@@ -280,12 +280,10 @@ int mei_task_initialize_clients(void *data);
 int mei_initialize_clients(struct mei_device *dev);
 struct mei_cl *mei_alloc_file_private(struct mei_device *dev);
 int mei_disconnect_host_client(struct mei_device *dev, struct mei_cl *cl);
-void mei_initialize_list(struct mei_io_list *list,
-			  struct mei_device *dev);
+void mei_initialize_list(struct mei_io_list *list, struct mei_device *dev);
 void mei_flush_list(struct mei_io_list *list, struct mei_cl *cl);
 void mei_flush_queues(struct mei_device *dev, struct mei_cl *cl);
-void mei_remove_client_from_file_list(struct mei_device *dev,
-				       u8 host_client_id);
+void mei_remove_client_from_file_list(struct mei_device *dev, u8 host_client_id);
 void host_init_iamthif(struct mei_device *dev);
 void mei_init_file_private(struct mei_cl *priv, struct mei_device *dev);
 void allocate_me_clients_storage(struct mei_device *dev);
@@ -339,8 +337,7 @@ int mei_find_me_client_index(const struct mei_device *dev, uuid_le cuuid);
  *
  * returns the byte read.
  */
-static inline u32 mei_reg_read(struct mei_device *dev,
-				unsigned long offset)
+static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset)
 {
 	return ioread32(dev->mem_addr + offset);
 }