Merge commit 'v3.4-rc4' into next

author Dmitry Torokhov <dmitry.torokhov@gmail.com>

Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)

committer Dmitry Torokhov <dmitry.torokhov@gmail.com>

Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
author Dmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
committer Dmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
diff --cc drivers/input/tablet/wacom_sys.c
Simple merge
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
		1	2
drivers/input/tablet/wacom_sys.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/tablet/wacom_wac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history