Merge branch 'denx'