a5c33d5f74
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.