From: Linus Torvalds Date: Wed, 23 Apr 2014 14:46:12 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6db8148cc59f738c0672f9998add5dc785aededf;p=deliverable%2Flinux.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull radeon drm fixes from Dave Airlie: "This is just radeon fixes, primarily the two pll fix and the aux fix, it also disables dpm on rv770 gpus, fixes driver reloading, and fixes two issues with runtime PM on some GPUS" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: don't allow runpm=1 on systems with out ATPX drm/radeon: fix ATPX detection on non-VGA GPUs drm/radeon/pm: don't walk the crtc list before it has been initialized (v2) drm/radeon: properly unregister hwmon interface (v2) drm/radeon: fix count in cik_sdma_ring_test() drm/radeon/aux: fix hpd assignment for aux bus drm/radeon: improve PLL limit handling in post div calculation drm/radeon: use fixed PPL ref divider if needed drm/radeon: disable dpm on rv770 by default --- 6db8148cc59f738c0672f9998add5dc785aededf