Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux