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

diff --cc drivers/base/power/main.c
Simple merge

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

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge