diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 10:21:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 10:21:44 -0700 |
| commit | e15e6119062d20cc96f95c8b345e361589a90244 (patch) | |
| tree | 101a476be5527d88eacaa828956d7f3a9a7cb316 /drivers/net | |
| parent | a637b0d45947df686979b85361ad5bfa9d19fdd3 (diff) | |
| parent | e253aaf0af51c1e4dc7dd3b26ea8e666bf9a2d8d (diff) | |
Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"MSI:
PCI: Set ->mask_pos correctly
Hotplug:
PCI: Delay final fixups until resources are assigned
Moorestown:
x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
* tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Delay final fixups until resources are assigned
x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0
PCI: Set ->mask_pos correctly
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions