Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[~andy/linux] / sound / core / vmaster.c

diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index a89948ae9e8d4dd6cf8859f4045a025cab92becd..a39d3d8c2f9c9edb53025953c102f5d5cdb89aa3 100644 (file)
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -233,7 +233,7 @@ static void slave_free(struct snd_kcontrol *kcontrol)
  * Add a slave control to the group with the given master control
  *
  * All slaves must be the same type (returning the same information
- * via info callback).  The fucntion doesn't check it, so it's your
+ * via info callback).  The function doesn't check it, so it's your
  * responsibility.
  *
  * Also, some additional limitations: