diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 11:00:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 11:00:30 -0700 |
| commit | 0ffe37de76a57ba38d960e370c2f8f1d799c94a1 (patch) | |
| tree | e771211305987dc4123fbcd68cff46bc8f3f0c60 /fs/dlm/lockspace.c | |
| parent | 4e24db5b1a8fe0b0afab875ad2facdfaedce7b07 (diff) | |
| parent | db8c076b9206ea35b1f7299708d5510b17674db2 (diff) | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
drm/i915: Hold a reference to the object whilst unbinding the eviction list
drm/i915,agp/intel: Add second set of PCI-IDs for B43
drm/i915: Fix Sandybridge fence registers
drm/i915/crt: Downgrade warnings for hotplug failures
drm/i915: Ensure that the crtcinfo is populated during mode_fixup()
Diffstat (limited to 'fs/dlm/lockspace.c')
0 files changed, 0 insertions, 0 deletions