)]}' { "commit": "4ff63e47f7b9dbd72031c364db44526b3c295591", "tree": "c3a59b173b42756ba0eda09a2df0449bcd91755c", "parents": [ "092369943623749b6c2321d65aaf4ec432cd3d04", "d8636a2717bb3da2a7ce2154bf08de90bb8c87b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 10:45:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 10:45:13 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Intel: edid fixes, power consumption fix, s/r fix, haswell fix\n\n Radeon: BIOS loading fixes for UEFI and Thunderbolt machines, better\n MSAA validation, lockup timeout fixes, modesetting fixes\n\n One udl dpms fix, one vmwgfx fix, a couple of trivial core changes.\n\n There is an export added to ACPI as part of the radeon bios fixes.\n\n I\u0027ve also included the fbcon flashing cursor vs deinit race fix, that\n seems the simplest place to start\"\n\nTrivial conflict in drivers/video/console/fbcon.c due to me having\nalready applied the fbcon flashing cursor vs deinit race fix, and Dave\nhad added a comment in there too.\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (22 commits)\n fbcon: fix race condition between console lock and cursor timer (v1.1)\n drm: Add missing static storage class specifiers in drm_proc.c file\n drm/udl: dpms off the crtc when disabled.\n drm: Remove two unused fields from struct drm_display_mode\n drm: stop vmgfx driver explosion\n drm/radeon/ss: use num_crtc rather than hardcoded 6\n Revert \"drm/radeon: fix bo creation retry path\"\n drm/i915: use hsw rps tuning values everywhere on gen6+\n drm/radeon: split ATRM support out from the ATPX handler (v3)\n drm/radeon: convert radeon vfct code to use acpi_get_table_with_size\n ACPI: export symbol acpi_get_table_with_size\n drm/radeon: implement ACPI VFCT vbios fetch (v3)\n drm/radeon/kms: extend the Fujitsu D3003-S2 board connector quirk to cover later silicon stepping\n drm/radeon: fix checking of MSAA renderbuffers on r600-r700\n drm/radeon: allow CMASK and FMASK in the CS checker on r600-r700\n drm/radeon: init lockup timeout on ring init\n drm/radeon: avoid turning off spread spectrum for used pll\n drm/i915: fall back to bit-banging if GMBUS fails in CRT EDID reads\n drm/i915: extract connector update from intel_ddc_get_modes() for reuse\n drm/i915: fix hsw uncached pte\n ...\n", "tree_diff": [] }