Merge branch 'topic/cmi8330' into for-linus