Merge branch 'next' into for-linus

author Dmitry Torokhov <[email protected]>

Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)

committer Dmitry Torokhov <[email protected]>

Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
author Dmitry Torokhov <[email protected]>
Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
committer Dmitry Torokhov <[email protected]>
Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
diff --cc drivers/input/keyboard/stmpe-keypad.c
Simple merge
diff --cc drivers/input/mouse/alps.c
Simple merge
author	Dmitry Torokhov <[email protected]>
	Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
committer	Dmitry Torokhov <[email protected]>
	Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
		1	2
drivers/input/keyboard/stmpe-keypad.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/alps.c	patch \|	diff1 \|	diff2 \|	blob \| history