tree 6f407983f0a37dd250d0014b990bbf118df57e34
parent ea056df7965fc46cfff28fd3808bf3ada23d5059
parent ccb8d8d070b8f25f0163da5c9ceacf63a5169540
author Russell King <rmk+kernel@arm.linux.org.uk> 1273130194 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1273130194 +0100

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