Merge branch 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes