Daniel Vetter a22ddff8be Linux 3.6-rc2 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQLWtvAAoJEHm+PkMAQRiG/DYH+wd0FqfEuYkYk4KPyAPuhKpX zX7HYfLvyJE/ZYIdrhjq1E6Xm2KNr7gtX7/Rdzi2W38M9sjbYzwG1UGIw51qnxWy yZJH9BGkfyQgQPeuDGohfB6DkDy2JWr2eqMDvakjOwgBsIzji0PQD/f3UvndhtUa c+tTj/kjavHE1Yr2Wy6OnRZz3Uc0hIMn/Q0JqtbCs3LUgEV1KA4OEAe56XNz4Ku4 WE+FFaGFPvtriQsQON+ohPS5IC8jzQGK/0vbrJ4lWjFnZy4gvZXnborTOwD0WSQG fbsNuxp1AaM2/pqfMwXm1w0ADvwOITHNiwwXf9id6DoK81QwTFpUdvKpn6yB6gQ= =rurr -----END PGP SIGNATURE----- Merge tag 'v3.6-rc2' into drm-intel-next Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put even more madness on top: - drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in -fixes, that has been changed in a variable-rename in -next, too. - drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr (since all their users have been extracted in another fucntion), -fixes added another user for a hw workaroudn. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-08-17 09:01:08 +02:00
..
i2c
ttm	drm/ttm: remove stale declaration and field	2012-07-24 15:30:36 +10:00
drm_buffer.h
drm_cache.h
drm_core.h
drm_crtc_helper.h	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
drm_crtc.h	drm: remove the list_head from drm_mode_set	2012-07-19 21:27:51 -04:00
drm_dp_helper.h	drm/dp: Add DPCD defines for register 0x007	2012-05-22 10:18:36 +01:00
drm_edid.h	drm/edid: Add packed attribute to new gtf2 and cvt structs	2012-04-23 17:41:17 +01:00
drm_encoder_slave.h	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
drm_fb_helper.h	drm fb helper: remove unused variable crtc_id	2012-02-03 09:55:52 +00:00
drm_fixed.h	drm: fixed: Add dfixed_frac	2012-04-27 09:29:35 +01:00
drm_fourcc.h	drm: Add multi buffer plane pixel formats	2011-12-29 11:21:42 +09:00
drm_global.h
drm_hashtab.h
drm_mem_util.h	introduce SIZE_MAX	2012-05-31 17:49:26 -07:00
drm_memory.h
drm_mm.h	drm: Add colouring to the range allocator	2012-07-16 05:59:37 +10:00
drm_mode.h	drm: add bitmask property type	2012-05-22 10:54:16 +01:00
drm_os_linux.h
drm_pciids.h	drm/radeon: add some new SI pci ids	2012-08-13 10:50:53 -04:00
drm_sarea.h
drm_sysfs.h
drm_usb.h
drm.h	drm/prime: expose capability flags for userspace.	2012-05-18 11:12:16 +01:00
drmP.h	drm: kill dma queue support	2012-07-19 22:50:55 -04:00
exynos_drm.h	drm/exynos: add property for plane zpos	2012-07-27 11:13:54 +09:00
gma_drm.h	gma500: fix ioctl confict	2012-03-10 13:06:04 +00:00
i810_drm.h
i915_drm.h	drm/i915: Add I915_GEM_PARAM_HAS_SEMAPHORES	2012-08-08 14:29:12 +02:00
intel-gtt.h	drm/i915: call intel_enable_gtt	2012-06-12 22:21:07 +02:00
Kbuild	drm/exynos: exynos_drm.h header file fixes	2012-02-15 10:29:12 +09:00
mga_drm.h
nouveau_drm.h	drm/nouveau: mark most of our ioctls as deprecated, move to compat layer	2012-07-26 10:28:15 +10:00
r128_drm.h
radeon_drm.h	drm/radeon/kms: implement timestamp userspace query (v2)	2012-08-13 10:50:56 -04:00
savage_drm.h
sis_drm.h	drm/sis: fixup sis_mm ioctl structs	2012-07-19 22:51:58 -04:00
via_drm.h	drm/via: track obj->drm_fd relations in the driver	2011-12-22 00:33:19 +01:00
vmwgfx_drm.h	vmwgfx: Reinstate the update_layout ioctl	2011-11-02 08:30:31 +00:00