Merge branch 'topic/dw' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 9 Jun 2014 16:25:40 +0000 (21:55 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 9 Jun 2014 16:25:40 +0000 (21:55 +0530)

Trivial merge