Merge branch 'mcpm' of git://git.linaro.org/people/nico/linux into devel-stable