tree 64ecce9f31a7b88f16851d9deaf04af0d8611205
parent 9c6027133626efd773fa84478c5d8c9209df41f6
parent 9b3b8171f7f4ecbbc28f3c1ae60462826a5d9072
author Vinod Koul <vinod.koul@intel.com> 1510635969 +0530
committer Vinod Koul <vinod.koul@intel.com> 1510635969 +0530

Merge branch 'topic/sprd' into for-linus

Kconfig and Makefile conflicts so put them in right order (sprd ones after
stm ones)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>