tree 1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b
parent 8954bb0da99b76c7ce5edf2f314807cff68b6ea8
parent cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09
author Russell King <rmk+kernel@arm.linux.org.uk> 1277975760 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1277975764 +0100

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