Merge branch 'for-linus' into next
Dmitry Torokhov [Wed, 14 Apr 2010 06:21:38 +0000 (23:21 -0700)]
1  2 
drivers/input/input.c
drivers/input/keyboard/matrix_keypad.c
drivers/input/mouse/alps.c
drivers/input/serio/i8042.c
drivers/input/sparse-keymap.c

Simple merge
Simple merge
Simple merge
Simple merge