Merge branch 'next' into for-linus

author Dmitry Torokhov <[email protected]>

Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)

committer Dmitry Torokhov <[email protected]>

Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
author Dmitry Torokhov <[email protected]>
Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
committer Dmitry Torokhov <[email protected]>
Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
diff --cc drivers/input/keyboard/Kconfig
Simple merge
diff --cc drivers/input/mouse/Kconfig
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
author	Dmitry Torokhov <[email protected]>
	Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
committer	Dmitry Torokhov <[email protected]>
	Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
		1	2
drivers/input/keyboard/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history