diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 07:28:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 07:28:51 -0700 |
commit | 2169ce92ca996bdbb0baa8b99f928eb5e9a8f3ab (patch) | |
tree | b3569e3c80e9b92042d4e750438ade54320fe4a6 /Documentation/rapidio/sysfs.txt | |
parent | 7fc7693627f363820c0e95d1e082f73c197f83c4 (diff) | |
parent | f483d3923dc3a6394c483e28ccb3fe700bdf399e (diff) |
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: conditional resource-reallocation through kernel parameter pci=realloc
Diffstat (limited to 'Documentation/rapidio/sysfs.txt')
0 files changed, 0 insertions, 0 deletions