Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/oss/audio.c b/sound/oss/audio.c
index 7df48a25c4e..4b958b1c497 100644
--- a/sound/oss/audio.c
+++ b/sound/oss/audio.c
@@ -514,7 +514,7 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg)
                                 count += dmap->bytes_in_use;    /* Pointer wrap not handled yet */
                         count += dmap->byte_counter;
                 
-                        /* Substract current count from the number of bytes written by app */
+                        /* Subtract current count from the number of bytes written by app */
                         count = dmap->user_counter - count;
                         if (count < 0)
                                 count = 0;
@@ -931,7 +931,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg)
                         if (count < dmap_out->fragment_size && dmap_out->qhead != 0)
                                 count += dmap_out->bytes_in_use;        /* Pointer wrap not handled yet */
                         count += dmap_out->byte_counter;
-                        /* Substract current count from the number of bytes written by app */
+                        /* Subtract current count from the number of bytes written by app */
                         count = dmap_out->user_counter - count;
                         if (count < 0)
                                 count = 0;