diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 13:50:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 13:50:53 -0700 |
commit | b91fd4d5aad0c1124654341814067ca3f59490fc (patch) | |
tree | f1ea23a27f0ad1dd91c336658cceed05f02cef63 /mm/vmstat.c | |
parent | 4c0eec03b188efafba3a35315b59a9efbf9684fc (diff) | |
parent | f3f011750a18abc389ef1b0d504fbeeacf641919 (diff) | |
download | op-kernel-dev-b91fd4d5aad0c1124654341814067ca3f59490fc.zip op-kernel-dev-b91fd4d5aad0c1124654341814067ca3f59490fc.tar.gz |
Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"Here are some more fixes for v3.10. The Moorestown update broke Intel
Medfield devices, so I reverted it. The acpiphp change fixes a
regression: we broke hotplug notifications to host bridges when we
split acpiphp into the host-bridge related part and the
endpoint-related part.
Moorestown
Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
Hotplug
PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check"
* tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
Diffstat (limited to 'mm/vmstat.c')
0 files changed, 0 insertions, 0 deletions