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