Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char...