Merge branch 'rmk-next' into s3c64xx