Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 24 Dec 2010 09:36:37 +0000 (09:36 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 24 Dec 2010 09:36:37 +0000 (09:36 +0000)

Trivial merge