forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'md/for-linus' into async-tx-next

Browse source 
Conflicts:
	drivers/md/raid5.c
This commit is contained in:
Dan Williams 2009-09-08 17:55:54 -07:00
commit 9134d02bc0
2203 changed files with 56000 additions and 32067 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/pci_ids.h
View file

@ -2655,6 +2655,7 @@
#define PCI_DEVICE_ID_NETMOS_9835 0x9835
#define PCI_DEVICE_ID_NETMOS_9845 0x9845
#define PCI_DEVICE_ID_NETMOS_9855 0x9855
#define PCI_DEVICE_ID_NETMOS_9901 0x9901
#define PCI_VENDOR_ID_3COM_2 0xa727