Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus