diff --git a/[refs] b/[refs]
index 4037d893186d..3cbda94911ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 583c377f1d58e705f75d8d5648ab41722be1ebca
+refs/heads/master: bd12935f04066df31903eaf74b1cec03319ecd2e
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 8edba7b678eb..065819ba87c7 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -1237,7 +1237,7 @@ int acpi_check_resource_conflict(struct resource *res)
 
 	if (clash) {
 		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
-			printk(KERN_INFO "%sACPI: %s resource %s [0x%llx-0x%llx]"
+			printk("%sACPI: %s resource %s [0x%llx-0x%llx]"
 			       " conflicts with ACPI region %s"
 			       " [0x%llx-0x%llx]\n",
 			       acpi_enforce_resources == ENFORCE_RESOURCES_LAX