]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:11:15 +0000 (15:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:11:15 +0000 (15:11 +1000)
commit42009ed7f145ad46ec4dd70a1e75dc0d00d7e61a
treeb4693fd2e81a510bd21bddf6eb06900f26ea6681
parenta339f28848401bdbfbe02e1cfdd2743d23b66e4a
parent4ea3d051908020e12613c464263ed7e1a93cf21f
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma_regs.h
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/spi/spi-rspi.c