Merge branch 'next' into for-linus

author Dmitry Torokhov <[email protected]>

Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)

committer Dmitry Torokhov <[email protected]>

Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
author Dmitry Torokhov <[email protected]>
Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
committer Dmitry Torokhov <[email protected]>
Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
diff --cc drivers/input/touchscreen/cyttsp4_core.c
Simple merge
author	Dmitry Torokhov <[email protected]>
	Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
committer	Dmitry Torokhov <[email protected]>
	Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
		1	2
drivers/input/tablet/wacom_wac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/cyttsp4_core.c	patch \|	diff1 \|	diff2 \|	blob \| history