Merge branches 'misc', 'nes' and 'srp' into for-next

git-mirror · Mar 23, 2011 · ba82638 · ba82638
3 parents 7f9e5c4 + 748bfd9 + 071c778
commit ba82638
Show file tree

Hide file tree

Showing 3 changed files with 515 additions and 250 deletions.
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
@@ -694,7 +694,7 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
 	nesdev->netdev_count++;
 	nesdev->nesadapter->netdev_count++;
 
-	printk(KERN_ERR PFX "%s: NetEffect RNIC driver successfully loaded.\n",
+	printk(KERN_INFO PFX "%s: NetEffect RNIC driver successfully loaded.\n",
 			pci_name(pcidev));
 	return 0;