Merge branch 'asm-generic-uaccess-7' of git://git.kernel.org/pub/scm/linux/kernel...