diff --git a/[refs] b/[refs]
index 678287786470..cde4ff695aa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eba2ed9c9636d9e7ed203a2498ed230b48341709
+refs/heads/master: 1f940bdfc0d03265d178d9dfd840d854819f797d
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 91fa428fa2c1..16a902f099ac 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -1297,15 +1297,18 @@ static inline long nr_blockdev_pages(void)
 	return 0;
 }
 
-static inline void blk_start_plug(struct list_head *list)
+struct blk_plug {
+};
+
+static inline void blk_start_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_finish_plug(struct list_head *list)
+static inline void blk_finish_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_flush_plug(struct task_struct *tsk)
+static inline void blk_flush_plug(struct task_struct *task)
 {
 }