]> git.karo-electronics.de Git - karo-tx-linux.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)
commitb2396f7984ea09e83d489cfca6d5da62cc22945a
tree43e42015e6279af397ec1358a99afcc280b0cfab
parent42361f20f29021bfee8d9b5f651362dca83fd705
parentde61608acf89779c8831aaa1428b6975d49d98c0
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