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

author Mark Brown <broonie@linaro.org>

Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)
diff --cc drivers/hid/hid-input.c
Simple merge
diff --cc include/linux/hid.h
Simple merge
diff --cc kernel/fork.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 27 Sep 2013 09:44:04 +0000 (10:44 +0100)
		1	2
drivers/hid/hid-input.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history