Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into devel-stable