projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 267aa95 6cffde3)
Merge remote-tracking branch 'origin/v4.4/topic/optee-lsk-mainline' into linux-linaro...
authorAlex Shi <alex.shi@linaro.org>
Thu, 6 Jul 2017 03:12:46 +0000 (11:12 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 6 Jul 2017 03:12:46 +0000 (11:12 +0800)
Conflicts:
compatiable issues in
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_execbuffer.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.