diff --git a/[refs] b/[refs]
index ecf65ade0c95..ff24ab309cb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fbe85292f50ce6186619b83ed04d1bb91dda569
+refs/heads/master: 6778a35bd02939767a17463d74da113541c9371f
diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 07fc57429b58..715a23e4a1e9 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/include/linux/pci_ids.h
@@ -1460,6 +1460,8 @@
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC	0x0108
 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
 
+#define PCI_VENDOR_ID_ATTO		0x117c
+
 #define PCI_VENDOR_ID_RICOH		0x1180
 #define PCI_DEVICE_ID_RICOH_RL5C465	0x0465
 #define PCI_DEVICE_ID_RICOH_RL5C466	0x0466