tree c1384aa414c0867e3a9b9b5e709dc1b7738bf22e
parent 4ebf66233798347a73b01da5d30d5d2c0ef39f56
parent 1b6b8ce2ac372ea1f2065b89228ede105eb68dc5
author Linus Torvalds <torvalds@linux-foundation.org> 1240858786 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240858786 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: only save/restore existent registers in the PCIe capability
  x86/PCI: don't bother with root quirks if _CRS is used
  docbooks: add/fix PCI kernel-doc
  PCI: cleanup debug output resources
  x86/PCI: set_pci_bus_resources_arch_default cleanups
  x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86
  x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
  PCI quirk: disable MSI on VIA VT3364 chipsets