diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
| commit | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (patch) | |
| tree | c42632581244e8428e0623c5f11cd81b983d2eed /drivers/md | |
| parent | f1326e0892329b0d58dec467f71f5d94c4d5d5a9 (diff) | |
| parent | 9698ac7c353d6f22100c9fa24a830cae6a466cb4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsklsk-v3.10-15.01
Conflicts:
arch/arm64/include/asm/proc-fns.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/psci.c
Diffstat (limited to 'drivers/md')
0 files changed, 0 insertions, 0 deletions