Merge commit 'v2.6.32' into next

diff --cc drivers/char/keyboard.c
Simple merge

diff --cc drivers/input/ff-core.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/mouse/lifebook.c
Simple merge

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc include/linux/input.h
Simple merge