Merge branch 'synaptics' into for-linus

Bring in changes needed to properly handle Lenovo 2015 lineup.