Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa