Merge branch 'mpc86xx'