bc92d2ec4747b1babb7cb1264908018
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1234172627 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1234172627 +0000

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