Linus Torvalds 72a73a69f6 Merge master.kernel.org:/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 ...		2006-12-01 16:41:27 -08:00
..
4xx	ppc: Various minor compile fixes	2005-10-11 22:08:12 +10:00
8xx	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
82xx	[HEADERS] Put linux/config.h out of its misery.	2006-10-09 19:13:51 -04:00
83xx	Fix misc Kconfig typos	2006-11-30 05:22:59 +01:00
85xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
86xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
apus	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
cell	[POWERPC] Fix cell "new style" mapping and add debug	2006-11-10 21:35:36 +11:00
chrp	[POWERPC] Fix CHRP platforms with only 8259	2006-10-25 13:49:22 +10:00
embedded6xx	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
iseries	[POWERPC] Use 4kB iommu pages even on 64kB-page systems	2006-11-01 14:52:48 +11:00
maple	[POWERPC] Fix Maple secondary IDE interrupt	2006-10-10 11:54:26 +10:00
pasemi	[PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)	2006-10-09 14:19:08 -07:00
powermac	PCI: Delete unused extern in powermac/pci.c	2006-12-01 14:36:57 -08:00
prep	powerpc: Merge enough to start building in arch/powerpc.	2005-09-26 16:04:21 +10:00
pseries	[POWERPC] Use 4kB iommu pages even on 64kB-page systems	2006-11-01 14:52:48 +11:00
Makefile	[POWERPC] powerpc: PA Semi PWRficient platform support	2006-09-13 18:39:53 +10:00