Merge tag 'for-3.7' of git://openrisc.net/jonas/linux