Merge branch 'kmap_atomic_fixes' of git://git.linaro.org/people/nico/linux