linux/arch/mips
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
..
au1000 [MIPS] MTX-1 flash partition setup move to platform devices registration 2008-07-15 18:44:38 +01:00
basler/excite basler-excite: BKL pushdown 2008-06-20 14:05:54 -06:00
bcm47xx [MIPS] BCM47XX: Use new SSB SPROM data structure 2008-02-19 17:01:34 +00:00
boot [MIPS] checkfiles: Fix "need space after that ','" errors. 2007-10-11 23:46:15 +01:00
cobalt [MIPS] Cobalt: Register new LCD platform device. 2008-07-15 18:44:31 +01:00
configs [MIPS] TXx9: Update and merge defconfigs 2008-07-15 18:44:36 +01:00
dec [MIPS] DS1287: Add clockevent driver 2008-04-28 17:14:32 +01:00
emma2rh [MIPS] Remove mips_machtype from EMMA2RH machines 2008-07-15 18:44:39 +01:00
fw [MIPS] Remove mips_machtype from ARC based machines 2008-07-15 18:44:38 +01:00
gt64120/wrppmc [MIPS] remove wrppmc_machine_power_off() 2008-07-15 18:44:36 +01:00
jazz [MIPS] Remove mips_machtype from ARC based machines 2008-07-15 18:44:38 +01:00
kernel Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 2008-07-15 15:01:29 -07:00
lasat [MIPS] Remove mips_machtype for LASAT machines 2008-07-15 18:44:39 +01:00
lemote/lm2e [MIPS] Fulong: don't reinitialize pci_probe_only to it's default value. 2008-01-29 10:14:59 +00:00
lib iomap: fix 64 bits resources on 32 bits 2008-04-29 08:06:02 -07:00
math-emu [MIPS] replace __inline with inline 2008-04-28 17:14:26 +01:00
mipssim [MIPS] Remove TLB sanitation code 2008-04-28 17:14:25 +01:00
mm Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 2008-07-15 15:01:29 -07:00
mti-malta [MIPS] Malta: Cleanup organization of code into directories. 2008-07-15 18:44:34 +01:00
nxp/pnx8550 [MIPS] Alchemy, PNX: Use symbolic constants for DMA masks. 2008-07-15 18:44:29 +01:00
oprofile generic-ipi: more merge fallout 2008-07-15 22:08:52 +02:00
pci [MIPS] Remove mips_machtype for LASAT machines 2008-07-15 18:44:39 +01:00
pmc-sierra Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2008-07-16 17:25:46 -07:00
sgi-ip22 [MIPS] IP22: Add platform device for Indy volume buttons 2008-07-15 18:44:37 +01:00
sgi-ip27 [MIPS] Replace use of print_symbol with new %sP pointer format. 2008-07-15 18:44:33 +01:00
sgi-ip32 [MIPS] IP32: Add platform devices for audio and volume button 2008-07-15 18:44:32 +01:00
sibyte Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
sni [MIPS] Remove obsolete isa_slot_offset 2008-07-15 18:44:29 +01:00
txx9 [MIPS] TXx9: cleanup and fix some sparse warnings 2008-07-15 18:44:38 +01:00
vr41xx [MIPS] cmbvr4133: Remove support 2008-07-15 18:44:36 +01:00
Kconfig Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 2008-07-15 15:01:29 -07:00
Kconfig.debug [MIPS] Allow setting of the cache attribute at run time. 2008-04-28 17:14:25 +01:00
Makefile [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx 2008-07-15 18:44:38 +01:00