Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
commit91dc5646819e7fd4a60f5c6dd45030478dadf77b
tree8f080fa65a846a9b772b5bb362e95ce8a7c276ec
parent42f45c9abdea541a9f966553b5e71dd576d432f9
parent88720d8b842c59efcc0c4dc17e2107f4dae502f5
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
fs/fuse/dev.c
net/ipv4/tcp_output.c