Merge branch 'x86/asm' into x86/apic, to resolve a conflict
[firefly-linux-kernel-4.4.55.git] / arch / nios2 / include / uapi /
drwxr-xr-x   ..
drwxr-xr-x - asm