Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / blackfin / include / asm / futex.h
1 #include <asm-generic/futex.h>