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

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge