Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91dbc047 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging fixes from Greg KH:
 "Here are two tiny staging tree fixes for 4.3-rc5.

  One fixes the broken speakup subsystem as reported by a user, and the
  other removes an entry in the MAINTAINERS file for a developer that
  doesn't want to be listed anymore"

* tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: speakup: fix speakup-r regression
  MAINTAINERS: Remove myself as nvec co-maintainer
parents ef19df60 b1d562ac

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9914,7 +9914,6 @@ S: Maintained 
F:	drivers/staging/lustre



STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)

M:	Julian Andres Klode <jak@jak-linux.org>

M:	Marc Dietrich <marvin24@gmx.de>

L:	ac100@lists.launchpad.net (moderated for non-subscribers)

L:	linux-tegra@vger.kernel.org

drivers/staging/speakup/fakekey.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ void speakup_fake_down_arrow(void) 
	__this_cpu_write(reporting_keystroke, true);

	input_report_key(virt_keyboard, KEY_DOWN, PRESSED);

	input_report_key(virt_keyboard, KEY_DOWN, RELEASED);

	input_sync(virt_keyboard);

	__this_cpu_write(reporting_keystroke, false);



	/* reenable preemption */