Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 10:22:36 +0000 (11:22 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 10:22:36 +0000 (11:22 +0100)
commitbda15ed54357438acac98d7183a5f048c7b867b1
tree8423f5064ffbbe3f8587806409606017f1c590e2
parent0636726e22b7f6b15b36b280082b873d0602c2e1
parent0a04bbcfad047b28d5bd91df2ee3a0179f0e7cda
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
kernel/futex.c
net/ipv6/route.c
14 files changed:
Documentation/networking/ip-sysctl.txt
drivers/input/Kconfig
include/linux/ipv6.h
include/net/addrconf.h
include/net/ip.h
include/net/ipv6.h
net/ipv4/ip_output.c
net/ipv4/route.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/ipv6/icmp.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c