Merge branch 'next' into for-linus
Dmitry Torokhov [Sat, 19 Mar 2011 06:38:50 +0000 (23:38 -0700)]
1  2 
drivers/input/gameport/gameport.c
drivers/input/input.c
drivers/input/mouse/bcm5974.c
drivers/input/tablet/wacom_sys.c
drivers/input/touchscreen/ads7846.c
drivers/tty/sysrq.c
include/linux/input/matrix_keypad.h

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