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)
commit5d43889c07bb38694742936aa70d1187c012e198
tree73809dddae39ae3b746396e9779142dbd1973f33
parent95f75e91588afecfb0090988393653d21f5d1f91
parent374b105797c3d4f29c685f3be535c35f5689b30e
Merge tag 'v3.13-rc3' into for-linus

Merging with the mainline to sync up on changes to serio core.
drivers/input/touchscreen/usbtouchscreen.c