tree eb2060681552a00e9efa98224b95f69a3dc84390
parent b1add0480a95b6ceaece5caf6c50614771eae9b2
parent 7bff3c4ce44ea48f50dc47a5994454984bd08c59
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1223584385 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1223584385 +0100

Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel