Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus