Merge branches 'for-rc' and 'ti-soc' of .git into next