Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362862
b: refs/heads/master
c: 8e7ee6f
h: refs/heads/master
v: v3
  • Loading branch information
Xiangliang Yu authored and Bjorn Helgaas committed Apr 15, 2013
1 parent b883ac2 commit 740000e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 705888184276552a12475f9d9f9ee78136cd523a
refs/heads/master: 8e7ee6f5dfb56a32da760d990be908ed35b1c5bf
1 change: 1 addition & 0 deletions trunk/include/linux/pci_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,7 @@
#define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334

#define PCI_VENDOR_ID_MARVELL 0x11ab
#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b
#define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
Expand Down

0 comments on commit 740000e

Please sign in to comment.