Merge branch 'topic/xilinx' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Thu, 4 May 2017 10:38:21 +0000 (16:08 +0530)
committerVinod Koul <vinod.koul@intel.com>
Thu, 4 May 2017 10:38:21 +0000 (16:08 +0530)

Trivial merge