Merge branch 'tracing/core' into tracing/hw-breakpoints
[safe/jmp/linux-2.6] / include / asm-generic / poll.h
2007-05-11 Stephen RothwellConsolidate asm/poll.h