Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci...