]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit578cc33a6586a6c4b47ba654a570dd408b9c9ed7
tree43e42015e6279af397ec1358a99afcc280b0cfab
parentd2d61e970c97ee877151b571d7c6d0880eb8636e
parentd8f31e4099da282afd57cb5b7fbb583309aac9fd
Merge branch 'topic/of' into for-linus

Conflicts:
include/linux/dmaengine.h

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/dmaengine.c
include/linux/dmaengine.h