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