Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 32085249e9cb..0549d2115507 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -42,6 +42,7 @@
 #define AUTOFS_MINOR            235
 #define MAPPER_CTRL_MINOR       236
 #define LOOP_CTRL_MINOR         237
+#define VHOST_NET_MINOR         238
 #define MISC_DYNAMIC_MINOR      255
 
 struct device;