Merge branch 'multitouch' into for-linus