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

author Mark Brown <broonie@kernel.org>

Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
diff --cc drivers/base/firmware_class.c
Simple merge
diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
		1	2
drivers/base/firmware_class.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history