linux/arch/sh/include
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
..
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
cpu-common/cpu sh: Allow SH-3 and SH-5 to use common headers. 2008-07-29 22:52:49 +09:00
cpu-sh2/cpu SH2(A) cache update 2008-08-04 16:33:47 +09:00
cpu-sh2a/cpu sh: Fix UBC setup and registers for SH2A 2009-05-09 00:09:21 +09:00
cpu-sh3/cpu sh: remove old TMU driver 2009-05-12 19:53:14 +09:00
cpu-sh4/cpu sh: sh7722 mode pin definitions 2009-06-11 09:09:19 +03:00
cpu-sh5/cpu sh: Kill off unused SH-5 irq_describe cruft. 2009-05-07 18:17:20 +09:00
mach-common/mach sh: Add support mtd mapping for highlander 2009-06-16 16:49:03 +09:00
mach-dreamcast/mach sh: pci: Tidy up the dreamcast PCI support. 2009-04-20 20:22:05 +09:00
mach-landisk/mach sh: migrate to arch/sh/include/ 2008-07-29 08:09:44 +09:00
mach-se/mach sh: ms7724se: Add sh_eth support 2009-06-26 16:24:02 +09:00
mach-sh03/mach sh: migrate to arch/sh/include/ 2008-07-29 08:09:44 +09:00