Merge branch 'topic/sun6i' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 17 May 2016 04:45:20 +0000 (10:15 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 17 May 2016 04:45:20 +0000 (10:15 +0530)

Trivial merge