aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-17 19:05:34 +0100
committerMark Brown <broonie@linaro.org>2014-04-17 19:05:34 +0100
commit70830c6164e73518b82719e1e73746cfc984c4dd (patch)
tree6f58a3268ccb4b6c7c87dd11afb60f5fe6423caf /arch
parentcd179bf3a9bac5138b00f0c0c16b6990a98e1f3a (diff)
parent6846e7822c4cab5a84672baace3b768c2d0db142 (diff)
parent4cb9670f141f980afa9e68d1f44023976a166f0b (diff)
downloadlinaro-lsk-70830c6164e73518b82719e1e73746cfc984c4dd.tar.gz
Merge branches 'v3.10/topic/tc2' and 'v3.10/topic/arm64-fvp' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk