Linux v4.2

This is a squashed patch of the history from F22 + the 4.2 rebase

1 files changed, 0 insertions, 45 deletions

diff --git a/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch b/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch
deleted file mode 100644
index 9f82b7d66..000000000
--- a/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Sent for 3.16
-
-From a02f11f85e2cb2e0aced78913ebcf060d6055203 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 2 Jun 2014 17:40:58 +0200
-Subject: [PATCH 01/14] thinkpad_acpi: Add mappings for F9 - F12 hotkeys on
- X240 / T440 / T540
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The T440s user guide says that when Fn-lock is not active, the *40s' F9 - F12
-keys should be mapped to: control-panel, search, show-all-windows and Computer.
-
-These keys generate the sofar unused 28 - 31 hotkey scancodes.
-
-For the first 2 this nicely matches the icons on the keys, for the latter 2
-the icons are somewhat creative, which is why I ended up looking them up in
-the user manual.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/thinkpad_acpi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index 15e61c16736e..d82f196e3cfe 100644
---- a/drivers/platform/x86/thinkpad_acpi.c
-+++ b/drivers/platform/x86/thinkpad_acpi.c
-@@ -3171,8 +3171,10 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
- 		KEY_MICMUTE,	/* 0x1a: Mic mute (since ?400 or so) */
- 
- 		/* (assignments unknown, please report if found) */
--		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
- 		KEY_UNKNOWN,
-+
-+		/* Extra keys in use since the X240 / T440 / T540 */
-+		KEY_CONFIG, KEY_SEARCH, KEY_SCALE, KEY_COMPUTER,
- 		},
- 	};
- 
--- 
-1.9.0
-