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

author Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)

committer Mark Brown <broonie@linaro.org>

Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
author Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
committer Mark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
diff --cc drivers/input/Kconfig
Simple merge
diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc kernel/irq/pm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
committer	Mark Brown <broonie@linaro.org>
	Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
		1	2
drivers/input/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/irq/pm.c	patch \|	diff1 \|	diff2 \|	blob \| history