kernel-ark/arch/sh
Linus Torvalds dc7c65db28 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: (72 commits)
  Revert "x86/PCI: ACPI based PCI gap calculation"
  PCI: remove unnecessary volatile in PCIe hotplug struct controller
  x86/PCI: ACPI based PCI gap calculation
  PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
  PCI PM: Fix pci_prepare_to_sleep
  x86/PCI: Fix PCI config space for domains > 0
  Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
  PCI: Simplify PCI device PM code
  PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
  PCI ACPI: Rework PCI handling of wake-up
  ACPI: Introduce new device wakeup flag 'prepared'
  ACPI: Introduce acpi_device_sleep_wake function
  PCI: rework pci_set_power_state function to call platform first
  PCI: Introduce platform_pci_power_manageable function
  ACPI: Introduce acpi_bus_power_manageable function
  PCI: make pci_name use dev_name
  PCI: handle pci_name() being const
  PCI: add stub for pci_set_consistent_dma_mask()
  PCI: remove unused arch pcibios_update_resource() functions
  PCI: fix pci_setup_device()'s sprinting into a const buffer
  ...

Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually.
2008-07-16 17:25:46 -07:00
..
boards Merge commit 'v2.6.26' into bkl-removal 2008-07-14 15:29:34 -06:00
boot sh: remove -traditional. 2008-05-08 19:51:46 +09:00
cchips sh: Kill off more dead symbols. 2008-02-14 14:22:12 +09:00
configs Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel 2008-07-10 16:38:50 +01:00
drivers PCI: remove unused arch pcibios_update_resource() functions 2008-06-27 13:14:01 -07:00
kernel Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
lib sh: Fix up optimized SH-4 memcpy on big endian. 2008-05-16 14:55:07 +09:00
lib64 sh64: Fix up compile warning in event tracer. 2008-05-08 19:51:37 +09:00
math-emu sh: Fix up the math-emu build. 2007-06-11 15:57:42 +09:00
mm sh: add memory resources to /proc/iomem 2008-05-08 19:51:51 +09:00
oprofile sh: Add -Werror for clean directories. 2007-11-07 11:13:55 +09:00
tools sh: remove the broken SH_MPC1211 support 2008-05-08 19:51:39 +09:00
Kconfig sh: convert to generic helpers for IPI function calls 2008-06-26 11:22:58 +02:00
Kconfig.cpu sh: Disable big endian for SH-5. 2008-02-14 14:22:10 +09:00
Kconfig.debug sh: Disable 4KSTACKS on nommu. 2008-06-02 13:48:59 +09:00
Makefile sh: Add -mno-fdpic to default flags. 2008-06-09 16:49:43 +09:00