Merge tag 'v3.10-rc2' into drm-intel-next-queued

Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
grew a bit out of hand. intel_dp.c has the only real functional
conflict since the logic changed while dev_priv->edp.bpp was moved
around.

Also squash in a whitespace fixup from Ben Widawsky for
i915_gem_gtt.c, git seems to do something pretty strange in there
(which I don't fully understand tbh).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_dp.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 873e086ce3a1..2944278a8ba7 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -11,6 +11,7 @@
 #define DEBUGFS_MAGIC          0x64626720
 #define SECURITYFS_MAGIC        0x73636673
 #define SELINUX_MAGIC           0xf97cff8c
+#define SMACK_MAGIC             0x43415d53      /* "SMAC" */
 #define RAMFS_MAGIC             0x858458f6      /* some random number */
 #define TMPFS_MAGIC             0x01021994
 #define HUGETLBFS_MAGIC         0x958458f6      /* some random number */
@@ -29,6 +30,7 @@
 #define JFFS2_SUPER_MAGIC       0x72b6
 #define PSTOREFS_MAGIC          0x6165676C
 #define EFIVARFS_MAGIC          0xde5e81e4
+#define HOSTFS_SUPER_MAGIC      0x00c0ffee
 
 #define MINIX_SUPER_MAGIC       0x137F          /* minix v1 fs, 14 char names */
 #define MINIX_SUPER_MAGIC2      0x138F          /* minix v1 fs, 30 char names */