Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
[linux-2.6] / arch / x86 / include / asm / poll.h
1 #include <asm-generic/poll.h>