summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide/laptops
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2026-03-31 17:24:54 +0300
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2026-03-31 17:24:54 +0300
commita67a469cece4c46a729c1bb0fbe19e9572cda405 (patch)
treed4fb21eca4efd3ff1bab055065888068dadb99e5 /Documentation/admin-guide/laptops
parent8d95d1f4aa5c76202b0833a70998769384612488 (diff)
parentfbddf68d7b4e1e6da7a78dd7fbd8ec376536584a (diff)
downloadlwn-a67a469cece4c46a729c1bb0fbe19e9572cda405.tar.gz
lwn-a67a469cece4c46a729c1bb0fbe19e9572cda405.zip
Merge tag 'fixes' into 'for-next'
Allows uniwill-laptop feature work that depends on changes in the fixes branch proceed.
Diffstat (limited to 'Documentation/admin-guide/laptops')
-rw-r--r--Documentation/admin-guide/laptops/uniwill-laptop.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/laptops/uniwill-laptop.rst b/Documentation/admin-guide/laptops/uniwill-laptop.rst
index a16baf15516b..aff5f57a6bd4 100644
--- a/Documentation/admin-guide/laptops/uniwill-laptop.rst
+++ b/Documentation/admin-guide/laptops/uniwill-laptop.rst
@@ -24,7 +24,7 @@ Keyboard settings
The ``uniwill-laptop`` driver allows the user to enable/disable:
- - the FN and super key lock functionality of the integrated keyboard
+ - the FN lock and super key of the integrated keyboard
- the touchpad toggle functionality of the integrated touchpad
See Documentation/ABI/testing/sysfs-driver-uniwill-laptop for details.