Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index 06e9e88e4c05..bb14e4c67e89 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -657,7 +657,7 @@ static int AmiStateInfo(char *buffer, size_t space)
         len += sprintf(buffer+len, "\tsound.volume_right = %d [0...64]\n",
                        dmasound.volume_right);
         if (len >= space) {
-                printk(KERN_ERR "dmasound_paula: overlowed state buffer alloc.\n") ;
+                printk(KERN_ERR "dmasound_paula: overflowed state buffer alloc.\n") ;
                 len = space ;
         }
         return len;