tree bade11b3088e3768612ecb2cd6e285ab67a23286
parent f6335c43f3d7816ba2e69abce4f29c41f65bb27e
parent 175854be81dc42b70591760c193113e4898b3e6f
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1224700430 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1224700430 +0100

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