tree d8bfc950911cbe40f541d0e424650598075fb8be
parent 542f869f1826f092606efd0c4c771f070d1314f5
parent d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1238249743 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1238249743 +0000

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel