Merge commit 'linus' into next

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 1c9410d1822..bcc2d30ec24 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -955,7 +955,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
         INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed);
 
         ret = hp_sdc_init();
-        /* after sucessfull initialization give SDC some time to settle
+        /* after successfull initialization give SDC some time to settle
          * and then load the hp_sdc_mlc upper layer driver */
         if (!ret)
                 schedule_delayed_work(&moduleloader_work,
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index 820e51673b2..7d2b820ef58 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -125,7 +125,7 @@ static void hp_sdc_mlc_isr (int irq, void *dev_id,
                 break;
 
         default:
-                printk(KERN_WARNING PREFIX "Unkown HIL Error status (%x)!\n", data);
+                printk(KERN_WARNING PREFIX "Unknown HIL Error status (%x)!\n", data);
                 break;
         }