Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

diff --cc drivers/md/dm-cache-target.c
Simple merge

diff --cc fs/ext4/inline.c
Simple merge

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

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/pnode.c
Simple merge

diff --cc fs/pnode.h
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge