Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index dd0a2c810529..4b8a89189a29 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -10,12 +10,12 @@
 struct vm_area_struct;          /* vma defining user mapping in mm_types.h */
 
 /* bits in flags of vmalloc's vm_struct below */
-#define VM_IOREMAP      0x00000001      /* ioremap() and friends */
-#define VM_ALLOC        0x00000002      /* vmalloc() */
-#define VM_MAP          0x00000004      /* vmap()ed pages */
-#define VM_USERMAP      0x00000008      /* suitable for remap_vmalloc_range */
-#define VM_VPAGES       0x00000010      /* buffer for pages was vmalloc'ed */
-#define VM_UNLIST       0x00000020      /* vm_struct is not listed in vmlist */
+#define VM_IOREMAP              0x00000001      /* ioremap() and friends */
+#define VM_ALLOC                0x00000002      /* vmalloc() */
+#define VM_MAP                  0x00000004      /* vmap()ed pages */
+#define VM_USERMAP              0x00000008      /* suitable for remap_vmalloc_range */
+#define VM_VPAGES               0x00000010      /* buffer for pages was vmalloc'ed */
+#define VM_UNINITIALIZED        0x00000020      /* vm_struct is not fully initialized */
 /* bits [20..32] reserved for arch specific ioremap internals */
 
 /*