diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-20 13:47:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-20 13:47:14 +0800 |
| commit | 6381499f5898ef4144b1522cf35caab69d4d95eb (patch) | |
| tree | 137dd5f1a5d35dcdb8f98b4346466f98bb1e6357 /fs/ext4/inline.c | |
| parent | a057484ab40ff81f22a94bb62c035c78b5abd940 (diff) | |
| parent | a34f0e8a2f8976f0bae4962edf2af4dd16cb85f7 (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
replaced with _ASM_EXTABLE() in arch/arm64/include/asm/futex.h
Diffstat (limited to 'fs/ext4/inline.c')
0 files changed, 0 insertions, 0 deletions