Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh