Commit 1a5f20fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  MAINTAINERS - Add an entry for the input MT protocol
  Input: wacom - fix serial number handling on Cintiq 21UX2
  Input: fixup X86_MRST selects
  Input: sysrq - fix "stuck" SysRq mode
  Input: ad7877 - fix spi word size to 16 bit
  Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()
parents 55982d94 3267a87f

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2887,6 +2887,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git 
S:	Maintained

F:	drivers/input/



INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@euromail.se>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	Documentation/input/multi-touch-protocol.txt

K:	\b(ABS|SYN)_MT_



INTEL IDLE DRIVER

M:	Len Brown <lenb@kernel.org>

L:	linux-pm@lists.linux-foundation.org

drivers/char/sysrq.c

+6 −2
Original line number Diff line number Diff line
@@ -580,8 +580,12 @@ static bool sysrq_filter(struct input_handle *handle, unsigned int type, 
	case KEY_RIGHTALT:

		if (value)

			sysrq_alt = code;

		else if (sysrq_down && code == sysrq_alt_use)

		else {

			if (sysrq_down && code == sysrq_alt_use)

				sysrq_down = false;



			sysrq_alt = 0;

		}

		break;



	case KEY_SYSRQ:

drivers/input/keyboard/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config KEYBOARD_ATARI 
	  module will be called atakbd.



config KEYBOARD_ATKBD

	tristate "AT keyboard" if EMBEDDED || !X86

	tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST

	default y

	select SERIO

	select SERIO_LIBPS2

drivers/input/misc/pcf8574_keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static irqreturn_t pcf8574_kp_irq_handler(int irq, void *dev_id) 
	unsigned char nextstate = read_state(lp);



	if (lp->laststate != nextstate) {

		int key_down = nextstate <= ARRAY_SIZE(lp->btncode);

		int key_down = nextstate < ARRAY_SIZE(lp->btncode);

		unsigned short keycode = key_down ?

			lp->btncode[nextstate] : lp->btncode[lp->laststate];

drivers/input/serio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config SERIO_I8042 
	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86

	default y

	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \

		   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN

		   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST

	help

	  i8042 is the chip over which the standard AT keyboard and PS/2

	  mouse are connected to the computer. If you use these devices,

CRA Git | Maintained and supported by SUSTech CRA and CCSE