android_kernel_motorola_sm6225/arch/m68knommu
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
..
kernel PCI: remove unused arch pcibios_update_resource() functions 2008-06-27 13:14:01 -07:00
lib Generic semaphore implementation 2008-04-17 10:42:34 -04:00
mm m68knommu: mark mem init functions as __init 2007-10-23 20:45:44 -07:00
platform m68knommu: init coldfire timer TRR with n - 1, not n 2008-06-12 18:05:40 -07:00
defconfig m68knommu: update defconfig 2008-03-04 08:04:11 -08:00
Kconfig m68knommu: ColdFire add support for kernel preemption (missing chunk) 2008-05-13 08:02:23 -07:00
Kconfig.debug m68knommu: removing config variable DUMPTOFLASH 2008-02-05 09:44:21 -08:00
Makefile m68knommu: modify Makefiles to support common coldfire directory 2008-02-01 20:58:10 +11:00