Merge branch 'next' into for-linus
commit35858adbfca13678af99fb31618ef4428d6dedb0
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Mar 2010 07:55:20 +0000 (28 23:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Mar 2010 07:55:20 +0000 (28 23:55 -0800)
tree3336feaa61324486945816cb52c347733e7c0821
parent197d4db752e67160d79fed09968c2140376a80a3
parent4b70858ba8d4537daf782defebe5f2ff80ccef2b
Merge branch 'next' into for-linus
drivers/input/input.c
drivers/input/touchscreen/usbtouchscreen.c
include/linux/input.h