Merge branches 'upstream' and 'ntrig-multitouch' into for-linus