Merge branch 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Apr 2011 07:44:34 +0000 (08:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Apr 2011 07:44:34 +0000 (08:44 +0100)

Trivial merge