Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 29 Aug 2014 20:38:17 +0000 (21:38 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 29 Aug 2014 20:38:17 +0000 (21:38 +0100)
commit427366deb025eb4c0aabc34d9c8dd6471e347157
tree5e49c3e44c342a10e0feb94f6d540d0be1e14fea
parent8466df7262199de7bd0fb3ca0a5a8f0fcb22bce8
parent8d60710642cf8f36e8d21d9e9fd4b9536864f2f5
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
include/net/ip.h
include/net/ipv6.h
net/ipv4/ip_output.c
net/ipv4/route.c