Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Wed, 16 Jul 2014 00:41:04 +0000 (17:41 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 16 Jul 2014 00:41:04 +0000 (17:41 -0700)
commit41a50bdf16feaa1f17a8b6d3e2f254c5c8e28a1b
treeef788c5ca0ef76070dad68c91c088848d74a0c33
parent0b3d5ff454df314e41cc863e4d08d89aedb74aeb
parent58c62d4474fbeda42851553a546e5cb860a036ea
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
net/ipv6/ping.c