Merge branch 'linus' into core/futexes
[linux-2.6] / arch / cris / include / asm / local.h
1 #include <asm-generic/local.h>