diff --git a/[refs] b/[refs]
index c2b9d08642e1..491d3b1412e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4716a450eb490090b70f0d9fca8d0a6159e505ad
+refs/heads/master: d5dea7d95c48d7bc951cee4910a7fd9c0cd26fb0
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index e6b6b9c67023..337e16ab4a92 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -981,5 +981,15 @@ EXPORT_SYMBOL(pci_msi_enabled);
 
 void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
+	int pos;
 	INIT_LIST_HEAD(&dev->msi_list);
+
+	/* Disable the msi hardware to avoid screaming interrupts
+	 * during boot.  This is the power on reset default so
+	 * usually this should be a noop.
+	 */
+	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+	if (pos)
+		msi_set_enable(dev, pos, 0);
+	msix_set_enable(dev, 0);
 }