Merge branch 'fixes' into next
authorKishon Vijay Abraham I <kishon@ti.com>
Wed, 18 Oct 2017 11:01:59 +0000 (16:31 +0530)
committerKishon Vijay Abraham I <kishon@ti.com>
Wed, 18 Oct 2017 11:01:59 +0000 (16:31 +0530)

Trivial merge