diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 19:15:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 19:15:14 +0300 |
| commit | 4b1706927d8ebc9e0be6802b6d6918ad9f3d6843 (patch) | |
| tree | 4669a0ab5b172abbddd1e85ccc0b97d2c398fded /block/blk-cgroup.c | |
| parent | f46c5818b1570f58b1b7dc69e49060a6b9a1ac94 (diff) | |
| parent | 38d8571dad8a759bdc051dbff747b189c90658cf (diff) | |
| download | linux-4b1706927d8ebc9e0be6802b6d6918ad9f3d6843.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"i915 has a bunch of fixes, and Russell found a bug in sysfs writing
handling that results in userspace getting stuck"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: fix writing to /sys/class/drm/*/status
drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code
drm/i915: Include G4X/VLV/CHV in self refresh status
drm/i915: Initialize HWS page address after GPU reset
drm/i915: Don't skip request retirement if the active list is empty
drm/i915/hsw: Fix workaround for server AUX channel clock divisor
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions