Merge branch 'linus' into x86/x2apic

Conflicts:

	drivers/pci/dmar.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f3132aa47a69..f6f52c1a2aba 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -471,7 +471,7 @@ static int acpi_device_register(struct acpi_device *device,
         device->dev.release = &acpi_device_release;
         result = device_add(&device->dev);
         if(result) {
-                printk(KERN_ERR PREFIX "Error adding device %s", device->dev.bus_id);
+                dev_err(&device->dev, "Error adding device\n");
                 goto end;
         }