Merge branch 'davinci' into for-2.6.32