tree 77fd04c067b024887d801778227501762bdf2ddd
parent 4fce628f685945df4fd6fa1cab6f7eb397dc9267
parent 8010dad55a0ab0e829f3733854e5235eef4e2734
author Vinod Koul <vinod.koul@intel.com> 1389110784 +0530
committer Vinod Koul <vinod.koul@intel.com> 1389110784 +0530

Merge branch 'topic/of' into for-linus

Conflicts:
	drivers/dma/mmp_pdma.c

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