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

author Mark Brown <broonie@linaro.org>

Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)

committer Mark Brown <broonie@linaro.org>

Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)
author Mark Brown <broonie@linaro.org>
Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)
committer Mark Brown <broonie@linaro.org>
Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)
diff --cc fs/fs-writeback.c
Simple merge
diff --cc include/linux/mm.h
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)
committer	Mark Brown <broonie@linaro.org>
	Mon, 27 Jan 2014 14:57:42 +0000 (14:57 +0000)
		1	2
fs/fs-writeback.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history