Merge branch 'topic/defer_probe' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:02:28 +0000 (21:32 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:02:28 +0000 (21:32 +0530)
1  2 
include/linux/dmaengine.h

Simple merge