From 19c4255af584ea97206e837d1b773de34123ee0f Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sat, 17 Dec 2011 23:52:27 +0100
Subject: [PATCH] --- yaml --- r: 280654 b: refs/heads/master c:
 f80ea66808b45d19abeb66db936b8f797a2628ff h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1916798a6bd4..ec290c2084cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933aae54bea7d032023a59e0b3261b612f8065e0
+refs/heads/master: f80ea66808b45d19abeb66db936b8f797a2628ff
diff --git a/trunk/drivers/misc/bmp085.c b/trunk/drivers/misc/bmp085.c
index 5f898cb706a6..b29a2be24591 100644
--- a/trunk/drivers/misc/bmp085.c
+++ b/trunk/drivers/misc/bmp085.c
@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature)
 		*temperature = (x1+x2+8) >> 4;
 
 exit:
-	return status;;
+	return status;
 }
 
 /*