tree b9979a6649f053fc824f75e4ad65ac22854fd4b4
parent daaeb6c93829806221b2ac533330c64f338ebb89
parent f6919eb41127db2e06342efcc2da1eeb4646ec34
author Russell King <rmk+kernel@arm.linux.org.uk> 1255793341 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1255793341 +0100

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