Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 15 Sep 2013 12:43:45 +0000 (13:43 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 15 Sep 2013 12:43:45 +0000 (13:43 +0100)
commitdafe3258c5449e2697097285c37c761915053eae
tree3132efe10ff5766feae3311993cd7eef7e75d6f3
parent15812f79511f4b94ee42f35c9095ba0c0cb5204c
parent4ed4d44eb2192604716226a6f0edad02ab76101f
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/net/tun.c
net/ipv4/devinet.c
net/ipv4/tcp.c