Linus Torvalds 4406c56d0a Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits) PCI hotplug: clean up acpi_run_hpp() PCI hotplug: acpiphp: use generic pci_configure_slot() PCI hotplug: shpchp: use generic pci_configure_slot() PCI hotplug: pciehp: use generic pci_configure_slot() PCI hotplug: add pci_configure_slot() PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation PCI: Clear saved_state after the state has been restored PCI PM: Return error codes from pci_pm_resume() PCI: use dev_printk in quirk messages PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle PCI Hotplug: acpiphp: find bridges the easy way PCI: pcie portdrv: remove unused variable PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support ACPI PM: Replace wakeup.prepared with reference counter PCI PM: Introduce device flag wakeup_prepared PCI / ACPI PM: Rework some debug messages PCI PM: Simplify PCI wake-up code ... Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree scanning having been moved and merged for the 32- and 64-bit cases. The 'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.		2009-09-16 07:49:54 -07:00
..
drivers	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
include	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
kernel	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
os-Linux	uml: improve error messages	2009-04-01 08:59:16 -07:00
scripts	uml: throw out CONFIG_MODE_TT	2007-10-16 09:43:05 -07:00
sys-i386	uml: fix a section warning	2009-06-16 19:47:47 -07:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-x86_64	uml: bad macro expansion, parameter is member	2009-06-16 19:47:47 -07:00
defconfig	UML: update defconfig	2008-02-23 17:12:13 -08:00
Kconfig.char	sound: make OSS sound core optional	2008-08-29 10:06:21 +02:00
Kconfig.common	x86, um: get rid of arch/um/Kconfig.arch	2008-10-22 22:55:23 -07:00
Kconfig.debug	uml: GPROF needs to depend on FRAME_POINTER	2008-02-05 09:44:25 -08:00
Kconfig.net	uml: fix URLs in Kconfig and help strings	2008-02-05 09:44:25 -08:00
Kconfig.rest	uml: kill a kconfig warning	2009-04-21 13:41:50 -07:00
Kconfig.um	x86, um: get rid of arch/um/Kconfig.arch	2008-10-22 22:55:23 -07:00
Kconfig.x86	x86, um: get rid of arch/um/Kconfig.arch	2008-10-22 22:55:23 -07:00
Makefile	get rid of the last symlink in uml build	2009-01-05 17:41:45 -08:00
Makefile-i386	[UML] fix gcc ICEs and unresolved externs	2008-07-07 10:53:10 -07:00
Makefile-ia64
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas
Makefile-x86_64	[UML] fix gcc ICEs and unresolved externs	2008-07-07 10:53:10 -07:00