From: Linus Torvalds Date: Sat, 2 Dec 2006 00:41:27 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72a73a69f6a79266b8b4b18f796907b73a5c01e3;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (28 commits) PCI: make arch/i386/pci/common.c:pci_bf_sort static PCI: ibmphp_pci.c: fix NULL dereference pciehp: remove unnecessary pci_disable_msi pciehp: remove unnecessary free_irq PCI: rpaphp: change device tree examination PCI: Change memory allocation for acpiphp slots i2c-i801: SMBus patch for Intel ICH9 PCI: irq: irq and pci_ids patch for Intel ICH9 PCI: pci_{enable,disable}_device() nestable ports PCI: switch pci_{enable,disable}_device() to be nestable PCI: arch/i386/kernel/pci-dma.c: ioremap balanced with iounmap pci/i386: style cleanups PCI: Block on access to temporarily unavailable pci device pci: fix __pci_register_driver error handling pci: clear osc support flags if no _OSC method acpiphp: fix missing acpiphp_glue_exit() acpiphp: fix use of list_for_each macro Altix: Initial ACPI support - ROM shadowing. Altix: SN ACPI hotplug support. Altix: Add initial ACPI IO support ... --- 72a73a69f6a79266b8b4b18f796907b73a5c01e3