Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 25 May 2017 02:05:41 +0000 (10:05 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 25 May 2017 02:05:41 +0000 (10:05 +0800)
1  2 
Makefile
fs/ext4/inode.c

diff --cc Makefile
Simple merge
diff --cc fs/ext4/inode.c
Simple merge