diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-11 22:18:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-11 22:18:45 +0100 |
| commit | d551c7d2fda44743c4271d892fa08646b4e11617 (patch) | |
| tree | 6598cfded611d846cb10e0c62644b14827ab7259 /lib | |
| parent | 9c99e59e9c83ff4f058d485a01b22572ed502c1a (diff) | |
| parent | b02a82bf228d885f8b7de4935aa801ad4f520e4b (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-misc' into linux-linaro-lsk-v3.14
Conflicts:
arch/arm64/Kconfig
arch/arm64/boot/dts/apm-storm.dtsi
arch/arm64/include/asm/pgtable.h
mm/Kconfig
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions