Merge branch 'synaptics' into for-linus