diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-09 22:09:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-09 22:27:03 +0100 |
| commit | ee22524dbe4fcbaa8186296d197e73982a935565 (patch) | |
| tree | 3a30ec09b61048bdea28845126e897446c82f258 /fs/dlm/lock.c | |
| parent | 8ecd48091c61213762407f5ce02d3fa4ede66402 (diff) | |
| parent | a84034fddb11f30849dd7ce050689d615995c0d2 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into lsk-v3.10-arm64-hmp
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/topology.h
arch/arm64/kernel/smp.c
arch/arm64/kernel/topology.c
Diffstat (limited to 'fs/dlm/lock.c')
0 files changed, 0 insertions, 0 deletions