diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-05 11:08:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-05 11:08:31 +1000 |
| commit | d58e0d903477f5a158d7d4901eb6f96f8f4b6289 (patch) | |
| tree | 4f474568d94c74382b5a6fb5bcbed426e6b79cda /drivers/edac/ppc4xx_edac.h | |
| parent | d5b75dc01fa9c699aee5f82f5dbe508da438ff94 (diff) | |
| parent | eb8d4d0d994aebe4ebb6bccd3637ab55eab3fa81 (diff) | |
| download | talos-op-linux-d58e0d903477f5a158d7d4901eb6f96f8f4b6289.tar.gz talos-op-linux-d58e0d903477f5a158d7d4901eb6f96f8f4b6289.zip | |
Merge branch 'drm-next-3.19-wip' of git://people.freedesktop.org/~agd5f/linux into drm-next
- More cursor and hotspot handling fixes
- Fix some typos in the new smc fan control code and enable on CI
- VM and CS cleanups
* 'drm-next-3.19-wip' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: enable smc fan control on CI
drm/radeon: use pointers instead of indexes for CS chunks
drm/radeon: remove duplicates check
drm/ttm: optionally move duplicates to a separate list
drm/radeon: check the right ring in radeon_evict_flags()
drm/radeon: fix copy paste typos in fan control for si/ci
drm/radeon: Hide cursor on CRTCs used by fbdev (v2)
drm/radeon: add spinlock for BO_VA status protection (v2)
drm/radeon: fence PT updates as shared
drm/radeon: rename radeon_cs_reloc to radeon_bo_list
drm/radeon: drop the handle from radeon_cs_reloc
drm/radeon drop gobj from radeon_cs_reloc
drm/radeon: fix typo in new fan control registers for SI/CI
drm/radeon: sync all BOs involved in a CS
drm/radeon: Move hotspot handling out of radeon_set_cursor
drm/radeon: Re-show the cursor after a modeset
Diffstat (limited to 'drivers/edac/ppc4xx_edac.h')
0 files changed, 0 insertions, 0 deletions
