Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Grant Likely <grant.likely@secretlab.ca>

Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)

committer Grant Likely <grant.likely@secretlab.ca>

Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)
author Grant Likely <grant.likely@secretlab.ca>
Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)
committer Grant Likely <grant.likely@secretlab.ca>
Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
author	Grant Likely <grant.likely@secretlab.ca>
	Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)
committer	Grant Likely <grant.likely@secretlab.ca>
	Thu, 6 Dec 2012 13:58:31 +0000 (13:58 +0000)
		1	2
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history