aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-14 18:56:30 +0100
committerMark Brown <broonie@linaro.org>2014-04-14 18:56:30 +0100
commit5ad6d9ba813e2a36b624970f7e5beb4e12641bee (patch)
treeb98de36fe880e3fcf1792b000e3ea63679e6fc5b /arch
parentf74531a2ff1019f111b05163681ce826cbde9140 (diff)
parent0fe751fba7fe6ca36769c43c9ef183a4e1a1b29b (diff)
parent9a316d83594ef7fda4ed57fbb9ce5f4594e3f10e (diff)
downloadlinaro-lsk-5ad6d9ba813e2a36b624970f7e5beb4e12641bee.tar.gz
Merge branches 'v3.10/topic/configs' and 'v3.10/topic/arm64-hugepages' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk