From: Dave Airlie <airlied@redhat.com>
Date: Fri, 3 May 2013 00:09:11 +0000 (+1000)
Subject: Merge branch 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6110948846e9440a60e491a9be67a8a13c646b7e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux into drm-next

Just some fixes that have accumulated over the last couple of
weeks and some new PCI ids.

* 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix handling of v6 power tables
  drm/radeon: clarify family checks in pm table parsing
  drm/radeon: consolidate UVD clock programming
  drm/radeon: fix UPLL_REF_DIV_MASK definition
  radeon: add bo tracking debugfs
  drm/radeon: add new richland pci ids
  drm/radeon: add some new SI PCI ids
  drm/radeon: fix scratch reg handling for UVD fence
  drm/radeon: allocate SA bo in the requested domain
  drm/radeon: fix possible segfault when parsing pm tables
  drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
---

6110948846e9440a60e491a9be67a8a13c646b7e