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