adm5120: merge 2.6.30+ specific patches