From: Linus Torvalds Date: Fri, 21 Aug 2015 18:18:10 +0000 (-0700) Subject: Merge tag 'pci-v4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci X-Git-Tag: omap-for-v4.3/fixes-merge-window~72 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e45fc85a2f371f388ff3804271375a1aedbe3744;p=pandora-kernel.git Merge tag 'pci-v4.2-fixes-2' of git://git./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 --- e45fc85a2f371f388ff3804271375a1aedbe3744 Reading git-diff-tree failed