Merge branch 'r8152-net'