Merge tag 'xtensa-for-next-20140815' into for_next