tree f44ff7df4bae5ac265f68885663a790885895666
parent 4a014a240b5a3c3b167702948a22dbe9e9a150a8
parent a48dc30da44769ea3f3562c18f54878a9a3e78a1
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1240232584 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1240232584 +0100

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