Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 24 Oct 2016 04:30:07 +0000 (12:30 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 24 Oct 2016 04:30:07 +0000 (12:30 +0800)
1  2 
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
fs/ext4/inode.c
fs/fuse/dir.c

diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/fuse/dir.c
Simple merge