Merge commit 'v2.6.32-rc5' into for-linus

2009-11-02 22:10:07 -08:00
parent e57130698f 012abeea66
commit 7a53c7f56b
6919 changed files with 729154 additions and 357185 deletions
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -229,7 +229,7 @@ struct atkbd {
 };

 /*
- * System-specific ketymap fixup routine
+ * System-specific keymap fixup routine
 */
 static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);
 static void *atkbd_platform_fixup_data;