tree ec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664
parent 0882e8dd3aad33eca41696d463bb896e6c8817eb
parent 6845a658e09767e72c12558825ed66a9eda02737
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1239785901 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1239785901 +0100

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