diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-24 00:32:36 (GMT) |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-24 00:32:36 (GMT) |
| commit | a28afda8cc6a45b2c5a4f98cf8fcddd877597701 (patch) | |
| tree | 2ad4d76e22ddb294fcf31d06b79e7464c70c653a /fs/fuse/cuse.c | |
| parent | e1c171b86baaccab983ded5dfa1663c0981d2520 (diff) | |
| parent | defb9446fe417f72855bc8bf97aa5d8af076bdf8 (diff) | |
| download | linux-a28afda8cc6a45b2c5a4f98cf8fcddd877597701.tar.xz | |
Merge branch 'pci/bjorn-find-next-ext-cap' into next
* pci/bjorn-find-next-ext-cap:
PCI: Add Vendor-Specific Extended Capability header info
PCI: Add pci_find_next_ext_capability()
Conflicts:
drivers/pci/pci.c
Diffstat (limited to 'fs/fuse/cuse.c')
0 files changed, 0 insertions, 0 deletions