Merge branch 'for-linus' into next

Merge for-linus branch to sync Elan touchscreen driver code.