adm5120: merge 3.3 patches