From 5997e981e9f28f049fa301f32d02759f1a6c67fd Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sat, 13 Apr 2013 23:41:25 +0300
Subject: [PATCH] --- yaml --- r: 363216 b: refs/heads/master c:
 5f1e54e8c12219aa49a8fb3eb1503eefb5294ea3 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/misc/mei/wd.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8da5e4ac7ec5..b50bd3299591 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17
+refs/heads/master: 5f1e54e8c12219aa49a8fb3eb1503eefb5294ea3
diff --git a/trunk/drivers/misc/mei/wd.c b/trunk/drivers/misc/mei/wd.c
index 2413247fc392..eb3f05c8d7d0 100644
--- a/trunk/drivers/misc/mei/wd.c
+++ b/trunk/drivers/misc/mei/wd.c
@@ -317,7 +317,8 @@ static int mei_wd_ops_ping(struct watchdog_device *wd_dev)
  *
  * returns 0 if success, negative errno code for failure
  */
-static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev, unsigned int timeout)
+static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev,
+		unsigned int timeout)
 {
 	struct mei_device *dev;