Merge branch 'sparc' into next