Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
include
linux
pci_ids.h
Find file
Blame
History
Permalink
Merge branch 'master' into upstream
· 71d530cd
Jeff Garzik
authored
Jun 22, 2006
Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
71d530cd