Merge branch 'linus' into x86/mm
[linux-2.6] / arch / xtensa / include / asm / futex.h
1 #include <asm-generic/futex.h>