diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
| commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /Documentation/ABI/testing/sysfs-bus-pci | |
| parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
| parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-pci')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-pci | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index a3c5a6685036..ab8d76dfaa80 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci | |||
| @@ -117,7 +117,7 @@ Description: | |||
| 117 | 117 | ||
| 118 | What: /sys/bus/pci/devices/.../vpd | 118 | What: /sys/bus/pci/devices/.../vpd |
| 119 | Date: February 2008 | 119 | Date: February 2008 |
| 120 | Contact: Ben Hutchings <bhutchings@solarflare.com> | 120 | Contact: Ben Hutchings <bwh@kernel.org> |
| 121 | Description: | 121 | Description: |
| 122 | A file named vpd in a device directory will be a | 122 | A file named vpd in a device directory will be a |
| 123 | binary file containing the Vital Product Data for the | 123 | binary file containing the Vital Product Data for the |