Merge tag 'v3.13-rc3' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Dec 2013 06:22:40 +0000 (22:22 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Dec 2013 06:22:40 +0000 (22:22 -0800)
Merging with the mainline to sync up on changes to serio core.

1  2 
drivers/input/touchscreen/usbtouchscreen.c