Merge branches 'topic/core' and 'topic/stats' of git://git.kernel.org/pub/scm/linux...

author Mark Brown <broonie@kernel.org>

Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)

committer Mark Brown <broonie@kernel.org>

Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)
author Mark Brown <broonie@kernel.org>
Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)
committer Mark Brown <broonie@kernel.org>
Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)
committer	Mark Brown <broonie@kernel.org>
	Fri, 23 Oct 2015 16:28:29 +0000 (01:28 +0900)
		1	2	3
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history