tree 8de1ab7fbea2a342dd023ea836c570c7a95ef764
parent 3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c
parent 1d3e216f1d303878d7204de94dee251bc2702175
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1248947172 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1248947172 +0100

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