diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-19 21:02:37 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-19 21:02:37 +0400 |
| commit | 0c3bef612881ee6216a36952ffaabfc35b83545c (patch) | |
| tree | 46e69e46d557c319ff3f261f37f1c184eaa9b844 /block/cfq-iosched.c | |
| parent | 01b883358ba4b616d9d161b43af4bb5ee8124fe8 (diff) | |
| parent | 69566dd8be42dea7a22f625abc96e65bb4b45d1f (diff) | |
| download | linux-0c3bef612881ee6216a36952ffaabfc35b83545c.tar.xz | |
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
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions