Merge branch 'topic/edma' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:06:55 +0000 (07:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:06:55 +0000 (07:36 +0530)
commit7d9d43ace29be375d3d1654b688b94029308a1be
treeb5dd459d5cd5541636f09342a5d9a08dd3822af8
parent6df056d8e69a557ac76bc7a88960e4addbc98386
parente3faf2b8826b8ac58cdaad7f801e59e389320f0e
Merge branch 'topic/edma' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/edma.c