Merge branch 'for-linus' into next

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