Linus Torvalds 03a2c4d76c
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ...
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits)
vga_switcheroo: disable default y by new rules.
drm/nouveau: fix *staging* driver build with switcheroo off.
drm/radeon: fix typo in Makefile
vga_switcheroo: fix build on platforms with no ACPI
drm/radeon: Fix printf type warning in 64bit system.
drm/radeon/kms: bump the KMS version number for square tiling support.
vga_switcheroo: initial implementation (v15)
drm/radeon/kms: do not disable audio engine twice
Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"
drm/radeon/kms: do not preset audio stuff and start timer when not using audio
drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
drm/ttm: fix function prototype to match implementation
drm/radeon: use ALIGN instead of open coding it
drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
drm/i915: Use a dmi quirk to skip a broken SDVO TV output.
drm/i915: enable/disable LVDS port at DPMS time
drm/i915: check for multiple write domains in pin_and_relocate
drm/i915: clean-up i915_gem_flush_gpu_write_domain
drm/i915: reuse i915_gpu_idle helper
drm/i915: ensure lru ordering of fence_list
...
Fixed trivial conflicts in drivers/gpu/vga/Kconfig
2010-03-04 07:49:37 -08:00
2010-02-20 14:10:48 +00:00
2010-02-26 05:22:03 -08:00
2010-01-11 09:34:04 -08:00
2010-02-24 13:17:03 +00:00
2010-02-10 23:04:18 -08:00
2010-02-16 16:01:22 -08:00
2010-01-18 12:30:27 +01:00
2010-02-02 13:02:16 +09:00
2010-02-24 18:34:48 +01:00
2010-02-24 18:32:59 +01:00
2010-01-18 08:25:47 +01:00
2010-02-24 18:34:48 +01:00
2010-02-24 18:34:48 +01:00
2009-12-15 15:01:46 -05:00
2009-12-14 12:49:47 +11:00
2009-12-17 10:27:27 +00:00
2010-02-28 23:55:20 -08:00
2009-12-16 10:47:44 -08:00
2010-03-03 08:48:58 -08:00
2010-01-06 16:18:15 -05:00
2009-12-16 07:20:13 -08:00
2010-03-01 15:11:32 -05:00
2009-12-15 08:53:35 -08:00
2009-12-16 11:33:46 +00:00
2010-01-29 08:22:01 -08:00
2009-12-16 07:20:18 -08:00
2010-02-04 09:59:50 +01:00
2010-02-26 13:58:08 +01:00
2010-02-17 11:17:38 +09:00
2010-02-12 09:41:59 -08:00
2010-02-17 17:27:40 -08:00
2010-02-22 13:44:45 +01:00
2010-02-22 13:44:45 +01:00
2010-02-25 10:34:26 +01:00
2010-02-05 14:54:10 +01:00
2009-12-05 15:32:03 -08:00
2010-02-05 07:35:05 -08:00
2010-02-02 15:58:48 -08:00
2009-12-09 17:09:36 +11:00
2010-02-25 10:34:55 +01:00
2010-02-25 10:34:26 +01:00
2009-12-15 08:53:28 -08:00
2009-12-15 08:53:32 -08:00
2010-02-04 13:29:53 -08:00
2009-12-10 23:52:27 +00:00
2010-02-26 20:39:10 +01:00
2009-12-10 23:52:01 +00:00
2009-12-10 23:52:22 +00:00
2009-12-10 23:52:05 +00:00
2010-02-17 11:17:38 +09:00
2009-12-08 19:26:55 -08:00
2010-01-12 10:02:46 +01:00
2010-01-12 10:14:42 +01:00
2009-12-15 08:53:25 -08:00
2010-02-26 08:25:35 +01:00
2009-12-15 08:53:33 -08:00
2010-02-28 10:59:44 -08:00
2009-12-10 08:54:14 -06:00
2009-12-15 08:53:27 -08:00
2010-02-26 05:12:02 -08:00
2010-01-25 12:26:38 -02:00
2009-12-10 15:02:51 +01:00
2009-12-23 13:44:12 +01:00
2009-12-10 15:02:53 +01:00
2009-12-23 13:33:54 +01:00
2010-03-01 16:20:37 +10:00
2010-02-25 10:34:49 +01:00
2009-12-17 20:55:57 -08:00
2009-12-16 12:16:42 -05:00
2010-02-24 20:36:55 +01:00
2009-12-29 19:58:17 +01:00
2009-12-11 11:24:52 -08:00
2009-12-17 10:58:17 -05:00
2010-02-19 10:41:13 -05:00
2010-02-28 10:20:25 -08:00
2010-02-28 10:20:25 -08:00
2010-01-06 00:23:51 -08:00
2009-12-16 12:16:49 -05:00
2010-02-17 11:17:38 +09:00
2010-03-01 14:08:10 +00:00
2009-12-08 20:30:41 -08:00
2010-02-04 00:50:44 -08:00
2009-12-16 07:20:01 -08:00
2010-02-25 17:39:16 +01:00
2010-02-26 17:05:10 -08:00
2009-12-14 23:55:34 +01:00
2009-12-15 08:53:12 -08:00
2010-02-04 01:07:12 +01:00
2010-02-12 17:32:41 +00:00
2010-03-02 12:23:42 +01:00
2010-03-02 12:23:49 +01:00
2010-02-26 13:58:08 +01:00
2009-12-11 23:55:42 -08:00
2010-02-18 14:30:17 -08:00
2010-01-22 16:11:27 -05:00
2009-12-08 20:42:28 -08:00
2010-02-12 16:56:07 -08:00
2010-02-18 14:08:38 -08:00
2010-02-04 20:24:10 -08:00
2010-02-17 16:35:17 -08:00
2010-02-02 07:32:29 -08:00
2010-02-07 03:06:22 -05:00
2009-12-09 19:43:33 -08:00
2010-01-11 16:28:01 -08:00
2010-02-16 15:55:17 -08:00
2009-12-17 13:23:24 -08:00
2009-12-15 20:42:06 +01:00
2010-03-01 10:38:09 -08:00
2010-02-26 14:00:43 +01:00
2009-12-16 07:20:18 -08:00
2010-02-22 16:17:00 -08:00
2009-12-16 07:20:10 -08:00
2010-03-03 08:15:37 -08:00
2009-12-11 15:18:07 -08:00
2009-12-23 06:52:08 -05:00
2009-12-15 08:53:26 -08:00
2010-01-30 01:47:49 -08:00
2010-03-02 10:41:26 -08:00
2009-12-16 12:19:59 +01:00
2010-03-03 08:15:05 -08:00
2010-02-16 16:01:21 -08:00
2010-02-17 11:17:38 +09:00
2010-02-16 15:11:08 -08:00
2010-01-07 11:58:37 -06:00
2010-01-11 09:34:04 -08:00
2009-12-31 19:45:04 +00:00
2009-12-16 06:56:12 -08:00
2009-12-09 17:14:38 +11:00
2009-12-17 11:41:51 +00:00
2009-12-17 11:33:33 +00:00
2009-12-17 11:27:09 +00:00
2010-03-01 14:58:46 -05:00
2009-12-15 08:53:36 -08:00
2010-01-12 21:02:00 -08:00
2010-01-16 12:29:32 +01:00
2009-12-26 20:40:34 -08:00
2010-02-03 17:39:50 +11:00
2010-02-25 09:41:01 +01:00
2009-12-16 12:36:49 -08:00
2009-12-15 08:53:20 -08:00
2009-12-18 14:53:36 +11:00
2009-12-15 08:53:12 -08:00
2009-12-15 08:53:20 -08:00
2010-01-15 01:43:29 -08:00
2010-01-16 12:15:40 -08:00
2010-03-03 08:15:05 -08:00
2009-12-12 13:08:15 +01:00
2010-03-03 08:15:05 -08:00
2009-12-17 12:51:05 -08:00
2010-02-17 11:17:38 +09:00
2010-02-17 11:17:38 +09:00
2009-12-22 12:27:34 -05:00
2010-02-03 20:32:28 -08:00
2010-02-27 02:43:40 -08:00
2010-02-19 08:03:28 +01:00
2010-01-13 20:38:26 -08:00
2009-12-05 16:08:40 -05:00
2010-02-17 11:17:38 +09:00
2009-12-16 10:43:34 -08:00
2009-12-14 18:12:08 -05:00
2010-02-13 12:26:02 +09:00
2010-02-19 15:52:40 -05:00
2009-12-15 08:53:13 -08:00
2009-12-15 08:53:13 -08:00
2009-12-15 08:53:12 -08:00
2010-02-14 07:13:47 -07:00
2010-02-14 13:02:44 -07:00
2010-02-15 15:14:34 +02:00
2009-12-16 07:19:57 -08:00
2010-01-06 19:47:10 +11:00
2009-12-16 07:20:07 -08:00
2009-12-17 07:23:42 -08:00
2010-01-27 09:20:03 -08:00
2010-02-22 16:15:17 -08:00
2010-03-03 08:47:22 -08:00
2010-02-22 16:21:02 -08:00
2010-02-28 19:23:06 -08:00
2009-12-04 15:56:19 -08:00
2010-03-03 07:34:18 -08:00
2009-12-08 10:28:50 +09:00
2010-01-05 09:17:33 +09:00
2010-02-28 10:20:25 -08:00
2010-01-17 21:52:11 +11:00
2010-02-04 10:23:02 -08:00
2010-02-24 08:30:08 +01:00
2009-12-11 11:24:55 -08:00
2010-01-13 10:51:39 +01:00
2010-02-26 20:39:08 +01:00
2010-02-26 20:39:11 +01:00
2009-12-15 17:35:26 -05:00
2010-01-11 09:45:37 -08:00
2010-02-23 13:45:26 -08:00
2009-12-17 11:46:01 +00:00
2009-12-23 13:33:54 +01:00
2010-02-08 18:19:41 -06:00
2010-02-10 17:47:17 -08:00
2010-02-25 09:41:02 +01:00
2010-02-28 19:23:06 -08:00
2010-02-27 09:53:52 +01:00
2010-02-26 08:20:46 +01:00
2010-02-26 08:20:46 +01:00
2010-01-02 11:17:05 -08:00
2010-01-04 11:33:58 +01:00
2010-02-26 20:39:09 +01:00
2009-12-15 08:53:20 -08:00
2009-12-14 23:55:33 +01:00
2010-02-28 19:23:06 -08:00
2009-12-14 23:55:33 +01:00
2009-12-14 23:55:32 +01:00
2009-12-14 23:55:33 +01:00
2009-12-15 08:53:26 -08:00
2010-03-01 09:00:29 -08:00
2010-02-24 08:11:02 +11:00
2009-12-16 07:20:10 -08:00
2010-02-22 15:45:54 -08:00
2010-01-21 23:55:25 -08:00
2010-02-16 13:38:56 +09:00
2009-12-16 12:16:49 -05:00
2010-03-02 03:05:05 -08:00
2009-12-11 09:17:02 +01:00
2009-12-11 09:17:02 +01:00
2009-12-16 07:20:04 -08:00
2010-02-18 15:43:09 -08:00
2009-12-16 22:32:29 -05:00
2009-12-14 23:55:33 +01:00
2009-12-14 23:55:33 +01:00
2009-12-14 23:55:32 +01:00
2009-12-14 23:55:32 +01:00
2009-12-14 23:55:32 +01:00
2009-12-14 23:55:33 +01:00
2010-03-03 07:34:18 -08:00
2010-01-07 17:06:06 -08:00
2010-01-14 22:38:09 -05:00
2009-12-15 08:53:16 -08:00
2010-02-28 10:20:25 -08:00
2010-02-16 15:55:18 -08:00
2009-12-23 11:23:43 -08:00
2010-02-04 14:20:41 +11:00
2010-02-18 15:43:09 -08:00
2009-12-16 07:20:00 -08:00
2010-01-29 10:15:19 +01:00
2010-01-21 13:39:03 +01:00
2009-12-09 14:05:49 -05:00
2009-12-16 07:20:08 -08:00
2010-03-02 14:55:11 -08:00
2010-03-02 14:43:23 -08:00
2010-01-07 11:58:36 -06:00
2009-12-11 11:55:26 -08:00
2010-03-02 14:54:59 -08:00
2009-12-10 22:55:37 +01:00
2009-12-12 13:08:15 +01:00
2010-03-01 22:21:58 +11:00
2010-01-15 01:43:29 -08:00
2010-02-26 15:10:40 -03:00
2010-02-24 14:22:08 +10:30
2010-02-24 14:22:26 +10:30
2010-02-24 14:23:00 +10:30
2010-02-24 14:22:27 +10:30
2010-01-05 09:17:33 +09:00
2010-03-02 14:43:23 -08:00
2009-12-23 07:57:07 -05:00
2009-12-16 12:16:49 -05:00
2010-02-22 16:19:45 -08:00
03a2c4d76c