Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup