Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Wed, 11 Jun 2014 19:24:59 +0000 (12:24 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 11 Jun 2014 19:24:59 +0000 (12:24 -0700)
commit7e0967f127480c39317c7ff15e018ce0d7c40774
treebfb2aaf611e6a2c81cdc1c3e5299288ce57a1bf9
parent53a9dbb18edceca5fe3f824d90bd5bf94f136509
parentb50939f89dae691f8da9e0fd22e0eae0db1c0ae4
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
net/ipv6/ping.c