Dave Airlie e6b0b6a82f Linux 3.5-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQAfWKAAoJEHm+PkMAQRiG/DwIAIullMhkDhD/GJcn24ZbUJoa v6zRPK2hIavuKH/6bUoUiXT346PUYgVnRMhetuYKJFURz6KX/nmlxve/iXNn/WP1 9hnxhE+zcnp2qKI83c3Yok09eed1KnGY5hWQkqXM2gzji/OU0pCKchOcL01l//uz iiWpNAXEVUnT92CafnHlZ55f/MWVqRFmDKi3Ty1YKSskhojQ6NOPsWCxrTxKVbim 2YPXc3D+xLHzF12ufVgla20AF4KnK8m+tFugniRAqArIagpzBUP1x1wk0RN5PyBD FTP8lv7bSfBusp41/mPDB66WAe9EfQBoWQY6jloJjp0i8xnMyH5V05pImBV5NwU= =O+gl -----END PGP SIGNATURE----- Merge tag 'v3.5-rc7' into drm-next Merge Linus tree into drm to fixup conflicts in radeon code for further testing before upstream merge. Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/radeon/radeon_gart.c		2012-07-20 00:53:28 -04:00
..
Kconfig	drm/usb: move usb support into a separate module	2012-03-20 06:59:29 +00:00
Makefile
udl_connector.c
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	udl: support vmapping imported dma-bufs	2012-05-31 14:13:59 +01: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: port over blanking code from udlfb.	2012-07-19 22:30:41 -04:00
udl_transfer.c