diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-21 11:18:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-21 11:18:10 -0700 |
| commit | e45fc85a2f371f388ff3804271375a1aedbe3744 (patch) | |
| tree | 15092167edd99476f3b867ee8b2255709c10cb21 /include/linux | |
| parent | Merge tag 'media/v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| parent | PCI: Don't use 64-bit bus addresses on PA-RISC (diff) | |
| download | linux-dev-e45fc85a2f371f388ff3804271375a1aedbe3744.tar.xz linux-dev-e45fc85a2f371f388ff3804271375a1aedbe3744.zip | |
Merge tag 'pci-v4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These are fixes for ASPM-related NULL pointer dereference crashes on
Sparc and PowerPC and 64-bit PCI address-related HPMC crashes on
PA-RISC. These are both caused by things we merged in the v4.2 merge
window. Details:
Resource management
- Don't use 64-bit bus addresses on PA-RISC
Miscellaneous
- Tolerate hierarchies with no Root Port"
* tag 'pci-v4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Don't use 64-bit bus addresses on PA-RISC
PCI: Tolerate hierarchies with no Root Port
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions