diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
commit | fa6e6c7406806f9d4119703e4c3ad661c25b99ee (patch) | |
tree | 7b9c905e1befea12b5c04190d1aa3c89b3dfdd84 /fs/nfs/read.c | |
parent | 582ee3a96f6a108f589bdc4ce8cc8176c8d763e5 (diff) | |
parent | 258181e60ef13001b0ae05cb58079fd79ed86a46 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts solution:
keep 'KBUILD_CFLAGS += -fno-pic'
in arch/arm64/Makefile
Diffstat (limited to 'fs/nfs/read.c')
0 files changed, 0 insertions, 0 deletions