Merge branch 'topic/core' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:46:13 +0000 (09:16 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:46:13 +0000 (09:16 +0530)

Trivial merge