Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 3 Feb 2015 00:55:35 +0000 (16:55 -0800)
committerVinod Koul <vinod.koul@intel.com>
Tue, 3 Feb 2015 00:55:35 +0000 (16:55 -0800)
1  2 
drivers/dma/at_xdmac.c
drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c

Simple merge
Simple merge
Simple merge