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)
1  2 
net/ipv6/ping.c

diff --cc net/ipv6/ping.c
Simple merge