Merge branch 'topic/rcar' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 3 Feb 2015 00:55:43 +0000 (16:55 -0800)
committerVinod Koul <vinod.koul@intel.com>
Tue, 3 Feb 2015 00:55:43 +0000 (16:55 -0800)
1  2 
include/linux/dmaengine.h

Simple merge