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