Merge branch 'next' into for-linus

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

Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)

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

Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
author Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
committer Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
diff --cc drivers/input/evdev.c
Simple merge
diff --cc drivers/input/tablet/wacom_sys.c
Simple merge
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
		1	2
drivers/input/evdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/tablet/wacom_sys.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/tablet/wacom_wac.c	patch \|	diff1 \|	diff2 \|	blob \| history