Merge branch 'frv' (FRV patches from David Howells)