]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a646bd7 60f1df5)
Merge branch 'imx' into dmaengine-fixes
authorDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)
committerDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)
1  2 
drivers/dma/imx-sdma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/imx-sdma.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.