tree 43e42015e6279af397ec1358a99afcc280b0cfab
parent 42361f20f29021bfee8d9b5f651362dca83fd705
parent de61608acf89779c8831aaa1428b6975d49d98c0
author Vinod Koul <vinod.koul@intel.com> 1367511746 +0530
committer Vinod Koul <vinod.koul@intel.com> 1367511746 +0530

Merge branch 'topic/of' into for-linus

Conflicts:
	include/linux/dmaengine.h

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