diff --git a/[refs] b/[refs]
index 0a794bda4310..5c2ed1bf4863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc3f7ca51abb68b6ba0da719f56e33efcc2f450b
+refs/heads/master: 2fefef1828ded4df17cfb51481b9e0782d2b3ce2
diff --git a/trunk/drivers/ide/pci/alim15x3.c b/trunk/drivers/ide/pci/alim15x3.c
index ecaab5414987..cf84350efc55 100644
--- a/trunk/drivers/ide/pci/alim15x3.c
+++ b/trunk/drivers/ide/pci/alim15x3.c
@@ -884,7 +884,7 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
 	ide_pci_device_t *d = &ali15x3_chipset;
 
 	if (pci_dev_present(ati_rs100))
-		printk(KERN_ERR "Warning: ATI Radeon IGP Northbridge is not yet fully tested.\n");
+		printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
 
 #if defined(CONFIG_SPARC64)
 	d->init_hwif = init_hwif_common_ali15x3;