Sync up with 'for-linus' branch to avoid merge conflicts with following patches to Elan touchpad drivers.
