The patch that follows would be good to add to our tree.
It isn't critical, but it fixes an issue that Roy was seeing with single core models.
The patch is taken directly from upstream and I tested it here locally, although only on the newer FVP models.
It applied cleanly to our tree, so I don't see any problems taking it and adding it to linaro-topic-misc or somewhere suitable like that. You could even create a new topic for upstream fixes that will be removed next cycle if you wanted to be ultra-organised.