Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 25 Nov 2016 04:55:17 +0000 (12:55 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 25 Nov 2016 04:55:17 +0000 (12:55 +0800)
commit068e31608ab2e664dce897343a3e5d43c4f023e3
tree8f3cb76ede9e94d1abe48d3f94f627bb8864272f
parent662d618b983cd0566a1cc2ed28c09a0a4b07b9f3
parent5497d2d7d543b4b8854700d47a175e157fecbfd1
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
drivers/usb/gadget/function/u_ether.c
include/net/tcp.h
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c