Merge commit 'renesas-shdma-for-v3.17' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 21 Jul 2014 13:36:28 +0000 (19:06 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 21 Jul 2014 13:36:28 +0000 (19:06 +0530)

Trivial merge