Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
[firefly-linux-kernel-4.4.55.git] / arch / um / include /
drwxr-xr-x   ..
drwxr-xr-x - asm
drwxr-xr-x - shared