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
..
configs
dig
hp	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
ia32
include/asm	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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
kvm	KVM: Reduce runnability interface with arch support code	2009-09-10 08:33:13 +03:00
lib	[IA64] fix csum_ipv6_magic()	2009-09-02 09:14:48 -07:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
oprofile
pci	ia64/PCI: adjust section annotation for pcibios_setup()	2009-06-30 16:26:53 -07:00
scripts
sn	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
uv
xen	rcu: Simplify rcu_pending()/rcu_check_callbacks() API	2009-08-23 10:32:39 +02:00
install.sh
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
Kconfig.debug
Makefile	arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build	2009-08-11 14:52:11 -07:00
module.lds