Merge branch 'topic/of' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Thu, 2 May 2013 16:22:26 +0000 (21:52 +0530)
committerVinod Koul <vinod.koul@intel.com>
Thu, 2 May 2013 16:22:26 +0000 (21:52 +0530)
Conflicts:
include/linux/dmaengine.h

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Trivial merge