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, 0 insertions, 45 deletions

diff --git a/include/linux/kmalloc_sizes.h b/include/linux/kmalloc_sizes.h
deleted file mode 100644
index e576b848ce10..000000000000
--- a/include/linux/kmalloc_sizes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#if (PAGE_SIZE == 4096)
-        CACHE(32)
-#endif
-        CACHE(64)
-#if L1_CACHE_BYTES < 64
-        CACHE(96)
-#endif
-        CACHE(128)
-#if L1_CACHE_BYTES < 128
-        CACHE(192)
-#endif
-        CACHE(256)
-        CACHE(512)
-        CACHE(1024)
-        CACHE(2048)
-        CACHE(4096)
-        CACHE(8192)
-        CACHE(16384)
-        CACHE(32768)
-        CACHE(65536)
-        CACHE(131072)
-#if KMALLOC_MAX_SIZE >= 262144
-        CACHE(262144)
-#endif
-#if KMALLOC_MAX_SIZE >= 524288
-        CACHE(524288)
-#endif
-#if KMALLOC_MAX_SIZE >= 1048576
-        CACHE(1048576)
-#endif
-#if KMALLOC_MAX_SIZE >= 2097152
-        CACHE(2097152)
-#endif
-#if KMALLOC_MAX_SIZE >= 4194304
-        CACHE(4194304)
-#endif
-#if KMALLOC_MAX_SIZE >= 8388608
-        CACHE(8388608)
-#endif
-#if KMALLOC_MAX_SIZE >= 16777216
-        CACHE(16777216)
-#endif
-#if KMALLOC_MAX_SIZE >= 33554432
-        CACHE(33554432)
-#endif