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/net/ibmlana.c b/drivers/net/ibmlana.c
index 94d9969ec0bb..8ff68ae6b520 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -53,7 +53,7 @@ History:
         still work with 2.0.x....
   Jan 28th, 2000
         in Linux 2.2.13, the version.h file mysteriously didn't get
-        included.  Added a workaround for this.  Futhermore, it now
+        included.  Added a workaround for this.  Furthermore, it now
         not only compiles as a modules ;-)
   Jan 30th, 2000
         newer kernels automatically probe more than one board, so the
@@ -481,7 +481,7 @@ static void InitBoard(struct net_device *dev)
         if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt)
                 rcrval |= RCREG_AMC;
 
-        /* promiscous mode ? */
+        /* promiscuous mode ? */
 
         if (dev->flags & IFF_PROMISC)
                 rcrval |= RCREG_PRO;