Merge branch 'core/locking' into tracing/ftrace
[linux-2.6] / include / asm-m32r / poll.h
1 #include <asm-generic/poll.h>