Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 137dc22afa42..d84d19224a95 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -721,7 +721,7 @@ static int __init vdso_init(void)
 
 #ifdef CONFIG_PPC64
         /*
-         * Fill up the "systemcfg" stuff for backward compatiblity
+         * Fill up the "systemcfg" stuff for backward compatibility
          */
         strcpy((char *)vdso_data->eye_catcher, "SYSTEMCFG:PPC64");
         vdso_data->version.major = SYSTEMCFG_MAJOR;