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