diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /Documentation/ABI/testing/sysfs-bus-css | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-css')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-css b/Documentation/ABI/testing/sysfs-bus-css index b585ec258a08..2979c40c10e9 100644 --- a/Documentation/ABI/testing/sysfs-bus-css +++ b/Documentation/ABI/testing/sysfs-bus-css | |||
| @@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com> | |||
| 29 | linux-s390@vger.kernel.org | 29 | linux-s390@vger.kernel.org |
| 30 | Description: Contains the PIM/PAM/POM values, as reported by the | 30 | Description: Contains the PIM/PAM/POM values, as reported by the |
| 31 | channel subsystem when last queried by the common I/O | 31 | channel subsystem when last queried by the common I/O |
| 32 | layer (this implies that this attribute is not neccessarily | 32 | layer (this implies that this attribute is not necessarily |
| 33 | in sync with the values current in the channel subsystem). | 33 | in sync with the values current in the channel subsystem). |
| 34 | Note: This is an I/O-subchannel specific attribute. | 34 | Note: This is an I/O-subchannel specific attribute. |
| 35 | Users: s390-tools, HAL | 35 | Users: s390-tools, HAL |