Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 1 Mar 2011 08:47:30 +0000 (08:47 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 1 Mar 2011 08:47:30 +0000 (08:47 +0000)

Trivial merge