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