Merge branch 'for-next' of github.com:rydberg/linux into next

author Dmitry Torokhov <[email protected]>

Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)

committer Dmitry Torokhov <[email protected]>

Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
author Dmitry Torokhov <[email protected]>
Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
committer Dmitry Torokhov <[email protected]>
Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
diff --cc drivers/input/evdev.c
Simple merge
diff --cc include/linux/input.h
Simple merge
author	Dmitry Torokhov <[email protected]>
	Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
committer	Dmitry Torokhov <[email protected]>
	Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
		1	2
drivers/input/evdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/input.h	patch \|	diff1 \|	diff2 \|	blob \| history