Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 2f6252266a02..3e4f8c12ffce 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -148,7 +148,7 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,
         udelay(100);
         /*
          * send device address, command and value,
-         * skipping ack cycles inbetween
+         * skipping ack cycles in between
          */
         for (j = 0; j < 3; j++) {
                 switch (j) {
@@ -2143,7 +2143,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
                 ice->num_total_adcs = 2;
         }
 
-        /* to remeber the register values of CS8415 */
+        /* to remember the register values of CS8415 */
         ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (!ice->akm)
                 return -ENOMEM;