Merge remote-tracking branch 'spi/topic/core' into spi-linus

author Mark Brown <[email protected]>

Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)

committer Mark Brown <[email protected]>

Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
author Mark Brown <[email protected]>
Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
committer Mark Brown <[email protected]>
Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <[email protected]>
	Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
committer	Mark Brown <[email protected]>
	Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
		1	2
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	blob \| history