Dave Airlie 93bb70e0c0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next ... There was some merge conflicts in -next and they weren't so pretty, so backmerge now to avoid them. Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_modes.c		2012-08-27 16:22:20 +10:00
..
Kconfig	gpu/mfd/usb: Fix USB randconfig problems	2012-08-20 11:52:41 -07:00
Makefile	drm/udl: initial UDL driver (v4)	2012-03-15 13:35:34 +00:00
udl_connector.c	drm: remove the raw_edid field from struct drm_display_info	2012-08-24 09:37:36 +10:00
udl_drv.c	drm/udl: only bind to the video devices on the hub.	2012-06-16 11:09:58 +01:00
udl_drv.h	udl: add prime fd->handle support.	2012-05-23 10:46:05 +01:00
udl_encoder.c	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
udl_fb.c	udl: support vmapping imported dma-bufs	2012-05-31 14:13:59 +01:00
udl_gem.c	drm/udl: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. [1]	2012-08-09 09:58:44 +10:00
udl_main.c	drm/udl: Make sure to get correct endian keys from vendor descriptor	2012-06-25 07:43:12 +01:00
udl_modeset.c	drm/udl: dpms off the crtc when disabled.	2012-08-22 09:27:47 +10:00
udl_transfer.c	drm/udl: initial UDL driver (v4)	2012-03-15 13:35:34 +00:00