diff options
author | Dave Airlie <airlied@redhat.com> | 2015-04-20 01:32:26 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-04-20 03:05:20 (GMT) |
commit | 2c33ce009ca2389dbf0535d0672214d09738e35e (patch) | |
tree | 6186a6458c3c160385d794a23eaf07c786a9e61b /Documentation/input/yealink.txt | |
parent | cec32a47010647e8b0603726ebb75b990a4057a4 (diff) | |
parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 (diff) | |
download | linux-2c33ce009ca2389dbf0535d0672214d09738e35e.tar.xz |
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'Documentation/input/yealink.txt')
-rw-r--r-- | Documentation/input/yealink.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/yealink.txt b/Documentation/input/yealink.txt index 5360e43..8277b76 100644 --- a/Documentation/input/yealink.txt +++ b/Documentation/input/yealink.txt @@ -93,7 +93,7 @@ Format description: Format specifier '8' : Generic 7 segment digit with individual addressable segments - Reduced capability 7 segm digit, when segments are hard wired together. + Reduced capability 7 segment digit, when segments are hard wired together. '1' : 2 segments digit only able to produce a 1. 'e' : Most significant day of the month digit, able to produce at least 1 2 3. |