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)
commit2cd6f7928ca42c7744f493e0ae2a4acaf02331a0
tree2051ca01dbfeaa3185df454d874b6c450f540a92
parentc914570f28552eb4ed6f016ec7b1db292a7c924b
parent5cf5aec5b38a5143883fc5b689bf5c1c8ee48aa3
Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-linus
drivers/dma/at_xdmac.c
drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c