diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /Documentation/input/rotary-encoder.txt | |
parent | Input: elan_i2c - enable ELAN0600 acpi panels (diff) | |
parent | Linux 4.2-rc3 (diff) | |
download | linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.xz linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'Documentation/input/rotary-encoder.txt')
-rw-r--r-- | Documentation/input/rotary-encoder.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt index 92e68bce13a4..5737e3590adb 100644 --- a/Documentation/input/rotary-encoder.txt +++ b/Documentation/input/rotary-encoder.txt @@ -33,7 +33,7 @@ The phase diagram of these two outputs look like this: one step (half-period mode) For more information, please see - http://en.wikipedia.org/wiki/Rotary_encoder + https://en.wikipedia.org/wiki/Rotary_encoder 1. Events / state machine |