tree b7f95922b2f1da5b36d95176e6d8f826151f3ee1
parent 98797a241e28b787b84d308b867ec4c5fe7bbdf8
parent 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1244973616 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1244973616 +0100

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