Merge commit 'v2.6.32' into next
Dmitry Torokhov [Thu, 3 Dec 2009 07:38:13 +0000 (23:38 -0800)]
1  2 
drivers/char/keyboard.c
drivers/input/ff-core.c
drivers/input/input.c
drivers/input/mouse/lifebook.c
drivers/input/mouse/psmouse-base.c
include/linux/input.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge