diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-28 06:56:31 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-28 06:56:31 +0300 |
| commit | 21124e5c52ecf87c3fdcb03855ec852563ce93cf (patch) | |
| tree | db610467ee8b6552d2ad784ca1c33b3d8168d753 /fs/btrfs/locking.h | |
| parent | 8e4890fbfb8af675a3800cbbc3463825c372cf78 (diff) | |
| parent | afa4e53a7bcd4328d88e25c7a63746b65dc6bbe2 (diff) | |
| download | linux-21124e5c52ecf87c3fdcb03855ec852563ce93cf.tar.xz | |
Merge tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Two regression fixes from Ville.
* tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Cancel vdd off work before suspend
drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset
Diffstat (limited to 'fs/btrfs/locking.h')
0 files changed, 0 insertions, 0 deletions