Merge branch 'synaptics-rmi4' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 29 Dec 2016 18:08:49 +0000 (10:08 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 29 Dec 2016 18:08:49 +0000 (10:08 -0800)
This brings in fix for F03 build error when serio is module.


Trivial merge