Merge branch 'linus' into x86/urgent
[linux-2.6] / arch / um / include / asm / futex.h
1 #ifndef _ASM_FUTEX_H
2 #define _ASM_FUTEX_H
3
4 #include <asm-generic/futex.h>
5
6 #endif