diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-06 11:12:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-06 11:12:46 +0800 |
| commit | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 (patch) | |
| tree | 25eb3fb76fb618c29ae31c0638b45285782c666b /fs/gfs2/incore.h | |
| parent | 267aa95e09eec438abf8979b58cded5cbc5586cb (diff) | |
| parent | 6cffde33c2b0e522cfc96eda06390b532408ca32 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4
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
Diffstat (limited to 'fs/gfs2/incore.h')
0 files changed, 0 insertions, 0 deletions