tree 5e87a97f331d2e07d36260f9b3eec4971366363b
parent 56ddf7e6d4f69d7ce9f1c484b62e99d6b029e6f8
parent 99f329a2ba3c2d07cc90ca9309babf27ddf98bff
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1252405404 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1252405404 +0100

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