tree 2beda263b834fe7fec5f09b5cf03b155c6ff2569
parent 5876ee950f28612814cc4e01c5549718f8b79dce
parent 3e9c18e1dc71b9a0fac302e2defe99d850ad3d79
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1240851984 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1240851984 +0100

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci