Merge branch 'next' into for-linus

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

Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)

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

Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
author Dmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
committer Dmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
diff --cc drivers/input/input.c
Simple merge
diff --cc drivers/input/mouse/Kconfig
Simple merge
diff --cc drivers/input/mouse/hgpk.c
Simple merge
author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
		1	2
drivers/input/input.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/hgpk.c	patch \|	diff1 \|	diff2 \|	blob \| history