From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Feb 2013 08:46:26 +0000 (+1100)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~3680^2~1155
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2a1a6e7af41cd029c90b8d9d79a76452a864805e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm regression fix from Dave Airlie:
 "This one fixes a sleep while locked regression that was introduced
  earlier in 3.8."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: fix fence locking in ttm_buffer_object_transfer, 2nd try
---

2a1a6e7af41cd029c90b8d9d79a76452a864805e