After talking with Andy and Alexander, I've re-merged the linaro-3.1 tree with Andy's android tracking tree (currently on 3.1), and am switching to that as the base for the linaro-android-3.1 tree. Hopefully this will assure that there is little difference as possible between the linaro-android tree and Andy's android tracking tree (at least at this moment - tracking trees don't stay still :).
I've tagged it as: linux-linaro-3.1-2011.10-0-android-1
From the branch:
git://android.git.linaro.org/kernel/linaro-android.git linaro-android-3.1-agreen-rebase
Apologies to anyone who might have started basing work on the -ozoom-rebase branch. There really should be minimal difference between the two, and so it should be fairly easy to rebase any completed work onto the new branch.
thanks -john