Merge branch 'topic/altera' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 6 Sep 2017 16:24:01 +0000 (21:54 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 6 Sep 2017 16:24:01 +0000 (21:54 +0530)

Trivial merge