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

diff --cc Makefile
Simple merge

diff --cc crypto/testmgr.c
Simple merge

diff --cc drivers/usb/gadget/function/f_midi.c
Simple merge

diff --cc fs/ext4/xattr.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 include/linux/mount.h
Simple merge

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

diff --cc kernel/sysctl.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge