ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index ecd276ad6b19..5f898cb706a6 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -2,7 +2,7 @@
 
     This driver supports the bmp085 digital barometric pressure
     and temperature sensor from Bosch Sensortec. The datasheet
-    is avaliable from their website:
+    is available from their website:
     http://www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-05.pdf
 
     A pressure measurement is issued by reading from pressure0_input.
@@ -429,7 +429,7 @@ static int __devinit bmp085_probe(struct i2c_client *client,
         if (err)
                 goto exit_free;
 
-        dev_info(&data->client->dev, "Succesfully initialized bmp085!\n");
+        dev_info(&data->client->dev, "Successfully initialized bmp085!\n");
         goto exit;
 
 exit_free: