Merge branch 'for-upstream' of git://openrisc.net/jonas/linux