diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-12-05 12:18:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-05 12:18:35 +1000 |
| commit | 9255ce80f88ba885c38c0bbd235db7c24392e22e (patch) | |
| tree | 910ca32b727121f3e6cee63be4bb996529bc5c4d /drivers/scsi/dc395x.h | |
| parent | 89570eeb1720a95cb600b9d132d4fa65d9ae9012 (diff) | |
| parent | ffd3d3361d583cb73fa65a5fed3a196ba6f261bb (diff) | |
Merge branch 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Some additional fixes for 3.13. Regression fixes for audio and hw_i2c,
vram fix for some SI PX cards, race fix in the hwmon code, and a few other
odds and ends.
* 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/atom: fix bus probes when hw_i2c is set (v2)
drm/radeon: fix null pointer dereference in dce6+ audio code
drm/radeon: fixup bad vram size on SI
drm/radeon: fix VGT_GS_INSTANCE_CNT register
drm/radeon: Fix a typo in Cayman and Evergreen registers
drm/radeon/dpm: simplify state adjust logic for NI
drm/radeon: add radeon_vm_bo_update trace point
drm/radeon: add VMID allocation trace point
drm/radeon/dpm: Convert to use devm_hwmon_register_with_groups
drm/radeon: program DCE2 audio dto just like DCE3
drm/radeon: fix typo in fetching mpll params
Diffstat (limited to 'drivers/scsi/dc395x.h')
0 files changed, 0 insertions, 0 deletions