Merge branch 'master' into for-2.6.31
[linux-2.6] / arch / arm / include / asm / poll.h
1 #include <asm-generic/poll.h>