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)
commit72f0991354b24b9860ddc57b12d5c39bd8e3c962
treef91da47db566f66aa57dbcf4adee5d6b213c2e2a
parentb6fc513da50c5dbc457a8ad6b58b046a6a68fd9d
parentd7ddad0acc4add42567f7879b116a0b9eea31860
Merge branch 'synaptics-rmi4' into for-linus

This brings in fix for F03 build error when serio is module.