diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-29 04:31:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-29 04:31:33 +0200 |
| commit | c95389b4cd6a4b52af78bea706a274453e886251 (patch) | |
| tree | 01e0046bdef0121e57ebecbead1d757494dcbd13 /include | |
| parent | vfs: make the dentry cache use the lockref infrastructure (diff) | |
| parent | fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers (diff) | |
| download | linux-c95389b4cd6a4b52af78bea706a274453e886251.tar.xz linux-c95389b4cd6a4b52af78bea706a274453e886251.zip | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge fixes from Andrew Morton:
"Five fixes.
err, make that six. let me try again"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers
memcg: check that kmem_cache has memcg_params before accessing it
drivers/base/memory.c: fix show_mem_removable() to handle missing sections
IPC: bugfix for msgrcv with msgtyp < 0
Omnikey Cardman 4000: pull in ioctl.h in user header
timer_list: correct the iterator for timer_list
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/cm4000_cs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/cm4000_cs.h b/include/uapi/linux/cm4000_cs.h index bc51f77db918..1217f751a1bc 100644 --- a/include/uapi/linux/cm4000_cs.h +++ b/include/uapi/linux/cm4000_cs.h @@ -2,6 +2,7 @@ #define _UAPI_CM4000_H_ #include <linux/types.h> +#include <linux/ioctl.h> #define MAX_ATR 33 |