Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Wed, 28 Jan 2015 17:04:49 +0000 (17:04 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 28 Jan 2015 17:04:49 +0000 (17:04 +0000)
1  2 
net/ipv4/tcp_output.c

Simple merge