commit | 2a1a6e7af41cd029c90b8d9d79a76452a864805e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 08 19:46:26 2013 +1100 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 08 19:46:26 2013 +1100 |
tree | 7ff270b82aa78881ca54c30d2a1d5d4374324b09 | |
parent | 124b69b6cc1020fff589312c62fcaf360abd8d12 [diff] | |
parent | ff7c60c580d9722f820d85c9c58ca55ecc1ee7c4 [diff] |
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