Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc include/net/ip.h
Simple merge

diff --cc include/net/ipv6.h
Simple merge

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

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