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

Linux 3.7-rc2

Backmerge to solve two ugly conflicts:
- uapi. We've already added new ioctl definitions for -next. Do I need to say more?
- wc support gtt ptes. We've had to revert this for snb+ for 3.7 and
  also fix a few other things in the code. Now we know how to make it
  work on snb+, but to avoid losing the other fixes do the backmerge
  first before re-enabling wc gtt ptes on snb+.

And a few other minor things, among them git getting confused in
intel_dp.c and seemingly causing a conflict out of nothing ...

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/i915/intel_modes.c
	include/drm/i915_drm.h

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

1 files changed, 33 insertions, 0 deletions

diff --git a/include/uapi/linux/cuda.h b/include/uapi/linux/cuda.h
new file mode 100644
index 000000000000..286f9f10fce8
--- /dev/null
+++ b/include/uapi/linux/cuda.h
@@ -0,0 +1,33 @@
+/*
+ * Definitions for talking to the CUDA.  The CUDA is a microcontroller
+ * which controls the ADB, system power, RTC, and various other things.
+ *
+ * Copyright (C) 1996 Paul Mackerras.
+ */
+
+#ifndef _UAPI_LINUX_CUDA_H
+#define _UAPI_LINUX_CUDA_H
+
+/* CUDA commands (2nd byte) */
+#define CUDA_WARM_START         0
+#define CUDA_AUTOPOLL           1
+#define CUDA_GET_6805_ADDR      2
+#define CUDA_GET_TIME           3
+#define CUDA_GET_PRAM           7
+#define CUDA_SET_6805_ADDR      8
+#define CUDA_SET_TIME           9
+#define CUDA_POWERDOWN          0xa
+#define CUDA_POWERUP_TIME       0xb
+#define CUDA_SET_PRAM           0xc
+#define CUDA_MS_RESET           0xd
+#define CUDA_SEND_DFAC          0xe
+#define CUDA_RESET_SYSTEM       0x11
+#define CUDA_SET_IPL            0x12
+#define CUDA_SET_AUTO_RATE      0x14
+#define CUDA_GET_AUTO_RATE      0x16
+#define CUDA_SET_DEVICE_LIST    0x19
+#define CUDA_GET_DEVICE_LIST    0x1a
+#define CUDA_GET_SET_IIC        0x22
+
+
+#endif /* _UAPI_LINUX_CUDA_H */