Merge commit 'v2.6.30' into for-2.6.31
[safe/jmp/linux-2.6] / include / asm-generic / poll.h
2007-05-11 Stephen RothwellConsolidate asm/poll.h