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
..
acpi	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
asm-alpha	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
asm-arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-07-16 15:17:52 -07:00
asm-avr32	atmel-mci: Driver for Atmel on-chip MMC controllers	2008-07-15 14:14:49 +02:00
asm-blackfin	Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.	2008-06-19 17:46:39 +08:00
asm-cris
asm-frv	frv: fix irqs_disabled() to return an int, not an unsigned long	2008-07-12 14:33:42 -07:00
asm-generic	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
asm-h8300
asm-ia64	ACPI : Create "idle=nomwait" bootparam	2008-07-16 23:27:05 +02:00
asm-m32r	m32r: convert to generic helpers for IPI function calls	2008-06-26 11:22:57 +02:00
asm-m68k	m68k: Add ext2_find_{first,next}_bit() for ext4	2008-06-12 18:05:39 -07:00
asm-m68knommu
asm-mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-07-16 15:17:52 -07:00
asm-mn10300
asm-parisc	parisc: convert to generic helpers for IPI function calls	2008-06-26 11:22:57 +02:00
asm-powerpc	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
asm-s390	[S390] Remove P390 support.	2008-07-14 10:02:25 +02:00
asm-sh	sh: convert to generic helpers for IPI function calls	2008-06-26 11:22:58 +02:00
asm-sparc	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
asm-sparc64	fix "ftrace: store mcount address in rec->ip"	2008-07-01 17:46:14 +02:00
asm-um
asm-v850
asm-x86	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
asm-xtensa
crypto	crypto: hash - Move ahash functions into crypto/hash.h	2008-07-10 20:35:18 +08:00
drm	drm/radeon: fixup issue with radeon and PAT support.	2008-07-15 15:48:05 +10:00
keys
linux	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
math-emu
media	V4L/DVB (8092): videodev: simplify and fix standard enumeration	2008-06-26 15:58:57 -03:00
mtd
net	net-sched: change tcf_destroy_chain() to clear start of filter list	2008-07-01 19:52:38 -07:00
pcmcia	pcmcia: (re)move {pcmcia,pccard}_get_status	2008-06-24 15:33:44 +02:00
rdma	RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr	2008-07-14 23:48:53 -07:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-07-15 18:58:04 -07:00
sound	ALSA: Release v1.0.17	2008-07-14 09:54:43 +02:00
video
xen	xen: implement ptep_modify_prot_start/commit	2008-06-25 15:17:23 +02:00
Kbuild	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00