Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index 62de66af0a68..ddb0857e15a4 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -274,7 +274,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev)
         nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,
                                                 &nuc900_rtc_ops, THIS_MODULE);
         if (IS_ERR(nuc900_rtc->rtcdev)) {
-                dev_err(&pdev->dev, "rtc device register faild\n");
+                dev_err(&pdev->dev, "rtc device register failed\n");
                 err = PTR_ERR(nuc900_rtc->rtcdev);
                 goto fail3;
         }