Merge branch 'mini2440-dev-extras' into mini2440-dev