tree 6fd32770f9cb2f1a888775514294d60aecba5245
parent 6a5e293f1b34920c69a932ce37b4a4714a428dc7
parent 4367216a099b4df3fa2c4f2b086cda1a1e9afc4e
author Russell King <rmk+kernel@arm.linux.org.uk> 1255354688 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1255354688 +0100

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