diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
| commit | e6aa42f93751e4d9ac8505b7ac57acd5506bdec9 (patch) | |
| tree | 3bdbb589c7e0abeb111cdd142f647fd21c762355 /Documentation/ABI | |
| parent | usb: gadget: u_ether: Remove duplicated include in u_ether.c (diff) | |
| parent | Linux 5.19-rc4 (diff) | |
| download | linux-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.tar.xz linux-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.zip | |
Merge 5.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/ABI')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-vf610 b/Documentation/ABI/testing/sysfs-bus-iio-vf610 index 308a6756d3bf..491ead804488 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio-vf610 +++ b/Documentation/ABI/testing/sysfs-bus-iio-vf610 @@ -1,4 +1,4 @@ -What: /sys/bus/iio/devices/iio:deviceX/conversion_mode +What: /sys/bus/iio/devices/iio:deviceX/in_conversion_mode KernelVersion: 4.2 Contact: linux-iio@vger.kernel.org Description: |