Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

author Alex Shi <alex.shi@linaro.org>

Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)

committer Alex Shi <alex.shi@linaro.org>

Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
author Alex Shi <alex.shi@linaro.org>
Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
committer Alex Shi <alex.shi@linaro.org>
Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
diff --cc fs/fuse/dev.c
Simple merge
diff --cc net/ipv4/tcp_output.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Mon, 30 Mar 2015 03:38:42 +0000 (11:38 +0800)
		1	2
fs/fuse/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	patch \|	diff1 \|	diff2 \|	blob \| history