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

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/usb/gadget/composite.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 include/linux/mm_types.h
Simple merge

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

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/watchdog.c
Simple merge