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
..
boards	sh: use in-soc KEYSC on se7724	2009-08-15 12:58:47 +09:00
boot	sh: Merge the split arch/sh/boot/compressed/ Makefiles.	2009-05-10 00:58:21 +09:00
cchips	sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.	2009-05-20 11:27:13 +09:00
configs	sh: re-add LCDC fbdev support to the Migo-R defconfig	2009-07-01 15:31:33 +09:00
drivers	sh: pci: Initial PCI-Express support for SH7786 Urquell board.	2009-06-17 18:20:48 +09: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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
lib	sh: Handle calling csum_partial with misaligned data	2009-01-29 11:56:02 +09:00
lib64	sh: Convert sh64 to use the generic checksum code.	2009-06-15 00:00:42 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
oprofile	sh: Add support for SH7724 (SH-Mobile R2R) CPU subtype.	2009-04-16 14:40:56 +09:00
tools	sh: Record ms7724se in mach-types.	2009-05-26 17:02:18 +09:00
Kconfig	sh: Fix up HAVE_PERF_COUNTERS typo.	2009-06-24 01:41:05 +09:00
Kconfig.cpu	sh: Tidy up SH-4A boot_cpu_data.flags probing.	2009-06-01 19:50:08 +09:00
Kconfig.debug	sh: Kill off unused DEBUG_BOOTMEM symbol.	2009-06-25 21:17:19 +09:00
Makefile	sh: plug vsyscall dir in to archclean.	2009-06-10 09:48:33 +03:00