| commit | 0c3bef612881ee6216a36952ffaabfc35b83545c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 19 Aug 2011 17:02:37 +0000 (19 10:02 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 19 Aug 2011 17:02:37 +0000 (19 10:02 -0700) | ||
| tree | 46e69e46d557c319ff3f261f37f1c184eaa9b844 | treesnapshot (tar.gz zip) |
| parent | 01b883358ba4b616d9d161b43af4bb5ee8124fe8 | commitdiff |
| parent | 69566dd8be42dea7a22f625abc96e65bb4b45d1f | commitdiff |
Merge branch 'for-linus' of git://git./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
* '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