tree c81603910b742fbb0e4129034e5011364a9c7418
parent c76d292db9869ae73fd401e9a3fc728ed5caf0a7
parent ea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab
author Russell King <rmk+kernel@arm.linux.org.uk> 1295095144 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1295095144 +0000

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