diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/s390/include/asm/poll.h | |
| parent | selinux: add support for installing a dummy policy (v2) (diff) | |
| parent | IB/mlx4: Actually return L_Key and R_Key for fast register MRs (diff) | |
| download | linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/s390/include/asm/poll.h')
| -rw-r--r-- | arch/s390/include/asm/poll.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/poll.h b/arch/s390/include/asm/poll.h new file mode 100644 index 000000000000..c98509d3149e --- /dev/null +++ b/arch/s390/include/asm/poll.h @@ -0,0 +1 @@ +#include <asm-generic/poll.h> |