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
..
alchemy	MIPS: MTX-1: Request button GPIO before setting its direction	2009-08-03 17:52:46 +01:00
ar7	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
basler/excite	platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'	2009-03-24 16:38:25 -07:00
bcm47xx	MIPS: WGT634U: Add reset button support	2008-10-15 12:46:51 +01:00
boot	[MIPS] checkfiles: Fix "need space after that ','" errors.	2007-10-11 23:46:15 +01:00
cavium-octeon	MIPS: Octeon: Run IPI code with interrupts disabled.	2009-08-03 17:52:47 +01:00
cobalt	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
configs	MIPS: Add support for Texas Instruments AR7 System-on-a-Chip	2009-07-03 15:45:23 +01:00
dec	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00
emma	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00
fw	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00
gt64120/wrppmc	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
include/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
jazz	MIPS: Jazz: Fix read buffer overflow	2009-08-03 17:52:47 +01:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
lasat	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
lemote/lm2e	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
lib	MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel	2009-06-17 11:06:24 +01:00
math-emu	MIPS: Switch FPU emulator trap to BREAK instruction.	2008-10-30 14:44:34 +00:00
mipssim	MIPS: MIPSsim: Fix unbalance brace in mipssim get_c0_compare_int()	2009-08-03 17:52:41 +01:00
mm	MIPS: Drop mmap_sem in pagefault oom path	2009-08-03 17:52:40 +01:00
mti-malta	[PATCH] MIPS: SMTC: Fix compile error	2009-08-03 17:52:41 +01:00
nxp	MIPS: Use DIV_ROUND_CLOSEST	2009-08-03 17:52:46 +01:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	MIPS: Octeon PCIe: Make hardware and software bus numbers match.	2009-08-03 17:52:44 +01:00
pmc-sierra	MIPS: Simplify and correct interrupt handling for MSP4200	2009-08-03 17:52:43 +01:00
power	MIPS: Hibernation: Remove SMP TLB and cacheflushing code.	2009-06-24 18:34:39 +01:00
rb532	MIPS: RB532: Check irq number when handling GPIO interrupts	2009-06-17 11:06:27 +01:00
sgi-ip22	MIPS: IP22: Fix hang in power button interrupt handler	2009-05-20 18:53:13 +01:00
sgi-ip27	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
sgi-ip32	MIPS: IP32: Remove unnecessary if not even harmful volatile keywords.	2009-05-22 13:52:06 +01:00
sibyte	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00
sni	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
txx9	MIPS: RBTX4939: Fix IOC pin-enable register updating	2009-08-03 17:52:44 +01:00
vr41xx	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
Kconfig	MIPS: Allow suspend and hibernation again on uniprocessor kernels.	2009-07-03 15:45:28 +01:00
Kconfig.debug	MIPS: Kconfig: Fix the arch-specific header path	2008-12-12 18:12:23 +00:00
Makefile	MIPS: Add support for Texas Instruments AR7 System-on-a-Chip	2009-07-03 15:45:23 +01:00