diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:11:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:11:36 -0800 |
| commit | 43e407071d97c1a07a4601896581554a6b3bfd67 (patch) | |
| tree | 6f5bbf72bda0c983373a315d62dc229e591fca89 /init | |
| parent | 155b25bcc28631a5b5230191aa3f56c40dfffa3f (diff) | |
| parent | 299eb93c5f651b2bc368ada67d8471e4c575fa21 (diff) | |
| download | linux-3.10-43e407071d97c1a07a4601896581554a6b3bfd67.tar.gz linux-3.10-43e407071d97c1a07a4601896581554a6b3bfd67.tar.bz2 linux-3.10-43e407071d97c1a07a4601896581554a6b3bfd67.zip | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Fix use-before-null-check in i915_irq_emit().
drm: Avoid client deadlocks when the master disappears.
drm: Wake up all lock waiters when the master disappears.
drm: Don't return ERESTARTSYS to user-space.
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions