Linus Torvalds 553cbf0a8f Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ps3: Update ps3_defconfig powerpc/ps3: Update platform maintainer powerpc/pseries: Flush lazy kernel mappings after unplug operations powerpc/numa: Add form 1 NUMA affinity powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32 powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig powerpc/83xx: enable EPOLL syscall in defconfig powerpc/83xx: add RTC drivers in 83xx defconfig powerpc/fsl-cpm: Configure clock correctly for SCC powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n		2010-04-29 17:16:36 -07:00
..
hotplug	powerpc/pseries: Flush lazy kernel mappings after unplug operations	2010-04-28 16:23:24 +10:00
pcie	PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset	2010-04-08 09:24:11 -07:00
.gitignore
access.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bus.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dmar.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hotplug-pci.c
hotplug.c
htirq.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
intel-iommu.c
intr_remapping.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
intr_remapping.h
ioapic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
iov.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
iova.c
irq.c
Kconfig	PCI: push deprecated pci_find_device() function to last user	2010-02-22 16:17:01 -08:00
Makefile	microblaze: Enable PCI, missing files	2010-03-11 14:04:27 +01:00
msi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
msi.h
pci-acpi.c	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-03-01 10:36:22 -08:00
pci-driver.c	PCI PM: Run-time callbacks for PCI bus type	2010-02-22 16:21:19 -08:00
pci-stub.c
pci-sysfs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pci.c	PCI: Ensure we re-enable devices on resume	2010-04-22 16:13:47 -07:00
pci.h	PCI PM: Run-time callbacks for PCI bus type	2010-02-22 16:21:19 -08:00
probe.c	PCI: revert broken device warning	2010-04-22 16:13:16 -07:00
proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
quirks.c	PCI quirk: RS780/RS880: disable MSI behind the PCI bridge	2010-04-02 19:47:05 -07:00
remove.c
rom.c
search.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
setup-bus.c	pci: don't reassign to ROM res if it is not going to be enabled	2010-03-01 07:41:55 -08:00
setup-irq.c
setup-res.c	PCI: for address space collisions, show conflicting resource	2010-03-24 13:21:34 -07:00
slot.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
syscall.c
vpd.c	pci: Add helper to search for VPD keywords	2010-02-28 00:43:33 -08:00