tree 46e69e46d557c319ff3f261f37f1c184eaa9b844
parent 01b883358ba4b616d9d161b43af4bb5ee8124fe8
parent 69566dd8be42dea7a22f625abc96e65bb4b45d1f
author Linus Torvalds <torvalds@linux-foundation.org> 1313773357 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313773357 -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: OF: Don't crash when bridge parent is NULL.
  PCI: export pcie_bus_configure_settings symbol
  PCI: code and comments cleanup
  PCI: make cardbus-bridge resources optional
  PCI: make SRIOV resources optional
  PCI : ability to relocate assigned pci-resources
  PCI: honor child buses add_size in hot plug configuration
  PCI: Set PCI-E Max Payload Size on fabric