Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:05 +0000 (21:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:05 +0000 (21:33 +0100)
Merge branch 'davinci' into devel


Trivial merge