projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01ad154 2b67f8b)
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:52 +0000 (13:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:52 +0000 (13:01 +0000)
1  2 
drivers/dma/dmaengine.c patch | diff1 | diff2 | blob | history
sound/soc/soc-devres.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/dmaengine.c
Simple merge
diff --cc sound/soc/soc-devres.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.